diff options
| author | Greg Wilkins | 2013-02-21 03:57:36 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2013-02-21 03:57:36 +0000 |
| commit | bed3ea04f8fd9731a73b0d97c10b9f35fdb950b2 (patch) | |
| tree | 4a05afb7f9005709b840f3ec916c2e13ac7c775e /jetty-servlets/src | |
| parent | 27cad4960b06f2f5277bd35ef3dc677caedec844 (diff) | |
| download | org.eclipse.jetty.project-bed3ea04f8fd9731a73b0d97c10b9f35fdb950b2.tar.gz org.eclipse.jetty.project-bed3ea04f8fd9731a73b0d97c10b9f35fdb950b2.tar.xz org.eclipse.jetty.project-bed3ea04f8fd9731a73b0d97c10b9f35fdb950b2.zip | |
401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed. Handle no content-type in chunked request.
Diffstat (limited to 'jetty-servlets/src')
| -rw-r--r-- | jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java | 6 | ||||
| -rw-r--r-- | jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java index d4501d25af..67fdbd7175 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java @@ -581,6 +581,12 @@ public class ProxyServlet implements Servlet String hdr = (String)enm.nextElement(); String lhdr = hdr.toLowerCase(); + if ("transfer-encoding".equals(lhdr)) + { + if (request.getHeader("transfer-encoding").indexOf("chunk")>=0) + hasContent = true; + } + if (_DontProxyHeaders.contains(lhdr)) continue; if (connectionHdr != null && connectionHdr.indexOf(lhdr) >= 0) diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java index e52bbc6b4b..74c762fe33 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java @@ -265,7 +265,6 @@ public class ProxyServletTest "PUT /proxy/test HTTP/1.1\r\n"+ "Host: localhost:"+_connector.getLocalPort()+"\r\n"+ "Transfer-Encoding: chunked\r\n"+ - "Content-Type: text/plain\r\n"+ "Connection: close\r\n"+ "\r\n"+ "A\r\n"+ |