Issue jetty#3555 - Applying more changes from review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Anda77 · Apr 17, 2019 · b0f72a8 · b0f72a8
1 parent 5ef8a8a
commit b0f72a8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
@@ -35,6 +35,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.UrlEncoded;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.resource.Resource;
@@ -148,13 +149,11 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
                 // Context Path
                 ContextHandler context = (ContextHandler)handlers[i];
 
-                StringBuilder href = new StringBuilder();
-
                 String contextPath = context.getContextPath();
-                href.append(contextPath);
+                String href = UrlEncoded.encodeString(contextPath.substring(1), UTF_8);
                 if (contextPath.length() > 1 && !contextPath.endsWith("/"))
                 {
-                    href.append("/");
+                    href += '/';
                 }
 
                 if (context.isRunning())