diff options
| author | Joakim Erdfelt | 2014-11-25 19:09:09 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2014-11-25 19:09:21 +0000 |
| commit | ed594425d32395c58c8a6c359a5fb67c781dce53 (patch) | |
| tree | 83e01db51d8b862a16b639757d89291f33401bef /jetty-proxy | |
| parent | f853adb43c073bf4f569dde6af026d990c89407d (diff) | |
| parent | 07647e8a5f01ad3bc8adc368c5a4d4e1499e293d (diff) | |
| download | org.eclipse.jetty.project-ed594425d32395c58c8a6c359a5fb67c781dce53.tar.gz org.eclipse.jetty.project-ed594425d32395c58c8a6c359a5fb67c781dce53.tar.xz org.eclipse.jetty.project-ed594425d32395c58c8a6c359a5fb67c781dce53.zip | |
Merge branch 'jetty-9.2.x'
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
jetty-server/src/main/config/modules/server.mod
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
Diffstat (limited to 'jetty-proxy')
| -rw-r--r-- | jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletFailureTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletFailureTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletFailureTest.java index 6c600a589a..a3187f8821 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletFailureTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletFailureTest.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -104,7 +103,7 @@ public class ProxyServletFailureTest proxy = new Server(executor); proxyConnector = new ServerConnector(proxy); proxy.addConnector(proxyConnector); - proxyConnector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setDelayDispatchOnContent(false); + proxyConnector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setDelayDispatchUntilContent(false); ServletContextHandler proxyCtx = new ServletContextHandler(proxy, "/", true, false); ServletHolder proxyServletHolder = new ServletHolder(proxyServlet); |