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>
Show replies by date