Merge branch '2.5.x' into 2.6.x

Closes gh-30046
pull/30065/head
Andy Wilkinson 3 years ago
commit 97222236fe

@ -16,7 +16,6 @@
package smoketest.jetty.jsp; package smoketest.jetty.jsp;
import org.eclipse.jetty.server.AllowedResourceAliasChecker;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -60,7 +59,7 @@ class SampleWebJspApplicationTests {
JettyServerCustomizer jettyServerCustomizer() { JettyServerCustomizer jettyServerCustomizer() {
return (server) -> { return (server) -> {
ContextHandler handler = (ContextHandler) server.getHandler(); ContextHandler handler = (ContextHandler) server.getHandler();
handler.addAliasCheck(new AllowedResourceAliasChecker(handler)); handler.addAliasCheck((path, resource) -> true);
}; };
} }

Loading…
Cancel
Save