From fd7e05c7867ab716f45c90cfb3bad93fe0d898db Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 30 Sep 2021 13:28:15 +1000 Subject: [PATCH] backported fix for #6263 from 1c05b0bcb181c759e98b060bded0b9376976b055, but no tests Signed-off-by: Greg Wilkins --- .../main/java/org/eclipse/jetty/servlets/ConcatServlet.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ConcatServlet.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ConcatServlet.java index 44c1220e198f..4228f524f7e4 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ConcatServlet.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ConcatServlet.java @@ -62,6 +62,7 @@ * appropriate. This means that when not in development mode, the servlet must be * restarted before changed content will be served.

*/ +@Deprecated public class ConcatServlet extends HttpServlet { private boolean _development; @@ -126,7 +127,8 @@ else if (!type.equals(t)) } } - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(path); + // Use the original string and not the decoded path as the Dispatcher will decode again. + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(part); if (dispatcher != null) dispatchers.add(dispatcher); }