Merge pull request #12208 from jetty/jetty-12.0.x-11434-AliasCheckerS…

…ymlinkTests

Issue #11434 - resolve differences in AliasCheckerSymlinkTests

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java

@@ -1074,6 +1074,12 @@ public boolean handle(Request request, Response response, Callback callback) thr
 
     protected boolean handleByContextHandler(String pathInContext, ContextRequest request, Response response, Callback callback)
     {
+        if (isProtectedTarget(pathInContext))
+        {
+            Response.writeError(request, response, callback, HttpStatus.NOT_FOUND_404, null);
+            return true;
+        }
+
         return false;
     }
 

jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java

@@ -62,7 +62,6 @@
 import jakarta.servlet.descriptor.TaglibDescriptor;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSessionActivationListener;
 import jakarta.servlet.http.HttpSessionAttributeListener;
 import jakarta.servlet.http.HttpSessionBindingListener;
@@ -1191,12 +1190,8 @@ protected ContextResponse wrapResponse(ContextRequest request, Response response
     protected boolean handleByContextHandler(String pathInContext, ContextRequest request, Response response, Callback callback)
     {
         boolean initialDispatch = request instanceof ServletContextRequest;
-        if (initialDispatch && isProtectedTarget(pathInContext))
-        {
-            Response.writeError(request, response, callback, HttpServletResponse.SC_NOT_FOUND, null);
-            return true;
-        }
-
+        if (!initialDispatch)
+            return false;
         return super.handleByContextHandler(pathInContext, request, response, callback);
     }