diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index d397cbcfc8d..2b51c386c9d 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.4.4-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index 3ab11370e6a..d0ce96db3fa 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -687,6 +687,8 @@ public class HttpConnection extends AbstractConnection implements Connection @Override public void startRequest(Buffer method, Buffer uri, Buffer version) throws IOException { + uri=uri.asImmutableBuffer(); + _host = false; _expect = false; _expect100Continue=false; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java index 918ea9f7e3a..acf33226c9a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java @@ -25,4 +25,13 @@ public class SocketServerTest extends HttpServerTestBase { startServer(new SocketConnector()); } + + @Override + public void testBlockingWhileReadingRequestContent() throws Exception + { + // TODO Auto-generated method stub + super.testBlockingWhileReadingRequestContent(); + } + + }