Author: markt
Date: Mon Oct 29 19:53:56 2012
New Revision: 1403471
URL: http://svn.apache.org/viewvc?rev=1403471&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54067
1xx response codes do not have an entity body.
Prior to this fix 101 responses (HTTP upgrade) included "Transfer-encoding:
chunked" which does not make much sense.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1403468
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1403471&r1=1403470&r2=1403471&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Mon Oct 29 19:53:56 2012
@@ -1333,8 +1333,8 @@ public abstract class AbstractHttp11Proc
}
int statusCode = response.getStatus();
- if ((statusCode == 204) || (statusCode == 205)
- || (statusCode == 304)) {
+ if (statusCode < 200 || statusCode == 204 || statusCode == 205 ||
+ statusCode == 304) {
// No entity body
getOutputBuffer().addActiveFilter
(outputFilters[Constants.VOID_FILTER]);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1403471&r1=1403470&r2=1403471&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 29 19:53:56 2012
@@ -94,6 +94,12 @@
disconnect with APR/native on Windows Vista/2k8 or later. Patch provided
by Douglas Beachy. (markt)
</fix>
+ <fix>
+ <bug>54067</bug>: Ensure responses with 1xx response codes are
correctly
+ marked as not containing an entity body. This caused an issue for some
+ WebSocket clients when an Transfer-Encoding header was sent with the
+ 101 (HTTP upgrade) response. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
