JBossWeb SVN: r1671 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-03-01 08:20:02 -0500 (Tue, 01 Mar 2011)
New Revision: 1671
Added:
tags/JBOSSWEB_7_0_0_BETA4/
Log:
Beta 4.
13 years, 10 months
- 1
- 0
JBossWeb SVN: r1670 - in trunk: java/org/apache/catalina/connector and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-03-01 08:18:37 -0500 (Tue, 01 Mar 2011)
New Revision: 1670
Modified:
trunk/java/org/apache/catalina/Globals.java
trunk/java/org/apache/catalina/connector/Request.java
trunk/java/org/apache/tomcat/util/buf/StringCache.java
trunk/webapps/docs/changelog.xml
Log:
Use the desired AS defaults in the code (there's no catalina.properties in AS 7).
Modified: trunk/java/org/apache/catalina/Globals.java
===================================================================
--- trunk/java/org/apache/catalina/Globals.java 2011-03-01 13:16:25 UTC (rev 1669)
+++ trunk/java/org/apache/catalina/Globals.java 2011-03-01 13:18:37 UTC (rev 1670)
@@ -185,7 +185,7 @@
* compliance.
*/
public static final boolean STRICT_SERVLET_COMPLIANCE =
- Boolean.valueOf(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false")).booleanValue();
+ Boolean.valueOf(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "true")).booleanValue();
/**
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2011-03-01 13:16:25 UTC (rev 1669)
+++ trunk/java/org/apache/catalina/connector/Request.java 2011-03-01 13:18:37 UTC (rev 1670)
@@ -139,7 +139,7 @@
protected static final boolean SESSION_ID_CHECK =
- Boolean.valueOf(System.getProperty("org.apache.catalina.connector.Request.SESSION_ID_CHECK", "false")).booleanValue();
+ Boolean.valueOf(System.getProperty("org.apache.catalina.connector.Request.SESSION_ID_CHECK", "true")).booleanValue();
protected static final boolean WRAPPED_RESPONSE_IN_LOGIN =
Modified: trunk/java/org/apache/tomcat/util/buf/StringCache.java
===================================================================
--- trunk/java/org/apache/tomcat/util/buf/StringCache.java 2011-03-01 13:16:25 UTC (rev 1669)
+++ trunk/java/org/apache/tomcat/util/buf/StringCache.java 2011-03-01 13:18:37 UTC (rev 1670)
@@ -49,11 +49,11 @@
protected static int trainThreshold =
- Integer.parseInt(System.getProperty("org.apache.tomcat.util.buf.StringCache.trainThreshold", "20000"));
+ Integer.parseInt(System.getProperty("org.apache.tomcat.util.buf.StringCache.trainThreshold", "100000"));
protected static int cacheSize =
- Integer.parseInt(System.getProperty("org.apache.tomcat.util.buf.StringCache.cacheSize", "200"));
+ Integer.parseInt(System.getProperty("org.apache.tomcat.util.buf.StringCache.cacheSize", "5000"));
protected static int maxStringSize =
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-03-01 13:16:25 UTC (rev 1669)
+++ trunk/webapps/docs/changelog.xml 2011-03-01 13:18:37 UTC (rev 1670)
@@ -20,8 +20,12 @@
<subsection name="Catalina">
<changelog>
<fix>
- Revert allow setting content-length when using a writer. (markt)
+ Revert allow setting content-length when using a writer. (remm)
</fix>
+ <fix>
+ The various defaults for system properties will be the desired AS
+ defaults, while standalone will use a custom config. (remm)
+ </fix>
</changelog>
</subsection>
</section>
13 years, 10 months
- 1
- 0
JBossWeb SVN: r1669 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-03-01 08:16:25 -0500 (Tue, 01 Mar 2011)
New Revision: 1669
Modified:
trunk/java/org/apache/catalina/connector/Response.java
trunk/webapps/docs/changelog.xml
Log:
- Revert patch.
Modified: trunk/java/org/apache/catalina/connector/Response.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Response.java 2011-02-25 11:01:17 UTC (rev 1668)
+++ trunk/java/org/apache/catalina/connector/Response.java 2011-03-01 13:16:25 UTC (rev 1669)
@@ -725,6 +725,9 @@
if (included)
return;
+ if (usingWriter)
+ return;
+
coyoteResponse.setContentLength(length);
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-02-25 11:01:17 UTC (rev 1668)
+++ trunk/webapps/docs/changelog.xml 2011-03-01 13:16:25 UTC (rev 1669)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.0.Beta4 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Revert allow setting content-length when using a writer. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.0.Beta3 (remm)">
<subsection name="Catalina">
<changelog>
13 years, 10 months
- 1
- 0