Merge branch '3.4.x'

Closes gh-44190

Author: wilkinsona

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java

@@ -185,8 +185,14 @@ protected boolean ignoreApplicationContext(WebApplicationContext applicationCont
 		protected final boolean hasWebServerNamespace(ApplicationContext applicationContext,
 				WebServerNamespace webServerNamespace) {
 			return WebServerApplicationContext.hasServerNamespace(applicationContext, webServerNamespace.getValue())
-					|| (webServerNamespace.equals(WebServerNamespace.SERVER)
-							&& !(applicationContext instanceof WebServerApplicationContext));
+					|| hasImplicitServerNamespace(applicationContext, webServerNamespace);
+		}
+
+		private boolean hasImplicitServerNamespace(ApplicationContext applicationContext,
+				WebServerNamespace webServerNamespace) {
+			return WebServerNamespace.SERVER.equals(webServerNamespace)
+					&& WebServerApplicationContext.getServerNamespace(applicationContext) == null
+					&& applicationContext.getParent() == null;
 		}
 
 		@Override

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java

@@ -349,9 +349,12 @@ private RequestMatcherAssert assertMatcher(RequestMatcher matcher, PathMappedEnd
 	}
 
 	private RequestMatcherAssert assertMatcher(RequestMatcher matcher, PathMappedEndpoints pathMappedEndpoints,
-			RequestMatcherProvider matcherProvider, WebServerNamespace webServerNamespace) {
-		StaticWebApplicationContext context = (webServerNamespace != null)
-				? new NamedStaticWebApplicationContext(webServerNamespace) : new StaticWebApplicationContext();
+			RequestMatcherProvider matcherProvider, WebServerNamespace namespace) {
+		StaticWebApplicationContext context = new StaticWebApplicationContext();
+		if (namespace != null && !WebServerNamespace.SERVER.equals(namespace)) {
+			NamedStaticWebApplicationContext parentContext = new NamedStaticWebApplicationContext(namespace);
+			context.setParent(parentContext);
+		}
 		context.registerBean(WebEndpointProperties.class);
 		if (pathMappedEndpoints != null) {
 			context.registerBean(PathMappedEndpoints.class, () -> pathMappedEndpoints);
@@ -382,7 +385,7 @@ public WebServer getWebServer() {
 
 		@Override
 		public String getServerNamespace() {
-			return this.webServerNamespace.getValue();
+			return (this.webServerNamespace != null) ? this.webServerNamespace.getValue() : null;
 		}
 
 	}