backported fix for #6263 from 1c05b0b, but no tests (#6942)

Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Sep 30, 2021 · ebf6d3d · ebf6d3d
1 parent 6539dfd
commit ebf6d3d
Showing 1 changed file with 3 additions and 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
@@ -62,6 +62,7 @@
  * appropriate. This means that when not in development mode, the servlet must be
  * restarted before changed content will be served.</p>
  */
+@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);
         }