Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-07-19 04:55:02 -0400
committerGreg Wilkins2014-07-19 04:55:02 -0400
commitc72649e150608d28a9202c22905ebddc9c047ff4 (patch)
tree8b73c52d76e75d95b476c60b5b376e4ef7953096 /jetty-server
parentb38a978eacd5354b0d0ccc60604244d2d3df27ea (diff)
downloadorg.eclipse.jetty.project-c72649e150608d28a9202c22905ebddc9c047ff4.tar.gz
org.eclipse.jetty.project-c72649e150608d28a9202c22905ebddc9c047ff4.tar.xz
org.eclipse.jetty.project-c72649e150608d28a9202c22905ebddc9c047ff4.zip
435653 encode async dispatched requestURI
Diffstat (limited to 'jetty-server')
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/Server.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index 05295cbaef..ce4bdd9097 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -18,6 +18,7 @@
package org.eclipse.jetty.server;
+import java.awt.geom.PathIterator;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
@@ -513,16 +514,15 @@ public class Server extends HandlerWrapper implements Attributes
final Request baseRequest=connection.getRequest();
final String path=event.getPath();
-
+
if (path!=null)
{
// this is a dispatch with a path
ServletContext context=event.getServletContext();
- HttpURI uri = new HttpURI(URIUtil.encodePath(context==null?path:URIUtil.addPaths(context.getContextPath(),path)));
+ HttpURI uri = new HttpURI(URIUtil.addPaths(context==null?null:context.getContextPath(), path));
baseRequest.setUri(uri);
baseRequest.setRequestURI(null);
baseRequest.setPathInfo(uri.getDecodedPath());
-
if (uri.getQuery()!=null)
baseRequest.mergeQueryParameters(uri.getQuery(), true); //we have to assume dispatch path and query are UTF8
}

Back to the top