Author: remy.maucherat(a)jboss.com Date: 2010-04-01 08:08:30 -0400 (Thu, 01 Apr 2010) New Revision: 1428 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/Http11Processor.java Log: - More Tomcat junk. Disabled by default. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2010-03-31 18:45:30 UTC (rev 1427) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2010-04-01 12:08:30 UTC (rev 1428) @@ -79,6 +79,10 @@ StringManager.getManager(Constants.Package); + protected static final boolean CHUNK_ON_CLOSE = + Boolean.valueOf(System.getProperty("org.apache.coyote.http11.Http11Processor.CHUNK_ON_CLOSE", "false")).booleanValue(); + + // ----------------------------------------------------------- Constructors @@ -1707,7 +1711,7 @@ (outputFilters[Constants.IDENTITY_FILTER]); contentDelimitation = true; } else { - if (entityBody && http11 && keepAlive) { + if (entityBody && http11 && (keepAlive || CHUNK_ON_CLOSE)) { outputBuffer.addActiveFilter (outputFilters[Constants.CHUNKED_FILTER]); contentDelimitation = true; Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11Processor.java 2010-03-31 18:45:30 UTC (rev 1427) +++ trunk/java/org/apache/coyote/http11/Http11Processor.java 2010-04-01 12:08:30 UTC (rev 1428) @@ -79,6 +79,10 @@ StringManager.getManager(Constants.Package); + protected static final boolean CHUNK_ON_CLOSE = + Boolean.valueOf(System.getProperty("org.apache.coyote.http11.Http11Processor.CHUNK_ON_CLOSE", "false")).booleanValue(); + + // ------------------------------------------------------------ Constructor @@ -1590,7 +1594,7 @@ (outputFilters[Constants.IDENTITY_FILTER]); contentDelimitation = true; } else { - if (entityBody && http11 && keepAlive) { + if (entityBody && http11 && (keepAlive || CHUNK_ON_CLOSE)) { outputBuffer.addActiveFilter (outputFilters[Constants.CHUNKED_FILTER]); contentDelimitation = true;