Author: markt
Date: Sat Nov 1 17:43:13 2014
New Revision: 1635996
URL: http://svn.apache.org/r1635996
Log:
Revert r1635431 as discussed on dev list
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1635996&r1=1635995&r2=1635996&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sat
Nov 1 17:43:13 2014
@@ -1477,7 +1477,7 @@ public abstract class AbstractHttp11Proc
// If the response code supports an entity body and we're on
// HTTP 1.1 then we chunk unless we have a Connection: close header
connectionClosePresent = isConnectionClose(headers);
- if (entityBody && http11 && keepAlive && !connectionClosePresent) {
+ if (entityBody && http11 && !connectionClosePresent) {
getOutputBuffer().addActiveFilter
(outputFilters[Constants.CHUNKED_FILTER]);
contentDelimitation = true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1635996&r1=1635995&r2=1635996&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Nov 1 17:43:13 2014
@@ -238,10 +238,6 @@
<fix>
Async state MUST_COMPLETE should still be started. (remm)
</fix>
- <fix>
- Disable chunking when there is no keepalive (connection close is added
- at the end of the method). (remm)
- </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
