JBossWeb SVN: r1429 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2010-04-02 11:20:58 -0400 (Fri, 02 Apr 2010)
New Revision: 1429
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
- Port cut & paste fix.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2010-04-01 12:08:30 UTC (rev 1428)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-04-02 15:20:58 UTC (rev 1429)
@@ -5229,7 +5229,7 @@
"web application is running"
),
new MBeanNotificationInfo(new String[] {
- "j2ee.state.stopped"},
+ "j2ee.state.stopping"},
Notification.class.getName(),
"web application start to stopped"
),
15 years, 9 months
- 1
- 0
JBossWeb SVN: r1428 - trunk/java/org/apache/coyote/http11.
by jbossweb-commits＠lists.jboss.org
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;
15 years, 9 months
- 1
- 0