From 6bb8f793a3af79664b7ef56dc11a50d2a1f37c95 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 20 Apr 2017 14:32:54 +1000 Subject: [PATCH] Fixed #1487 #1486 --- .../src/main/java/org/eclipse/jetty/server/Request.java | 1 + .../test/java/org/eclipse/jetty/webapp/WebAppContextTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index 34af7363a1f..0af469959f8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -1765,6 +1765,7 @@ public class Request implements HttpServletRequest if (encoded==null) { path = uri.isAbsolute()?"/":null; + uri.setPath(path); } else if (encoded.startsWith("/")) { diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java index c78f1df4fc2..c69ae790f9a 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java @@ -217,7 +217,7 @@ public class WebAppContextTest server.start(); try { - String response = connector.getResponses("GET http://localhost:8080 HTTP/1.1\r\nHost: localhost:8080\r\nConnection: close\r\n\r\n"); + String response = connector.getResponse("GET http://localhost:8080 HTTP/1.1\r\nHost: localhost:8080\r\nConnection: close\r\n\r\n"); Assert.assertTrue(response.indexOf("200 OK")>=0); } finally