Author: markt
Date: Sun Dec 23 12:16:08 2007
New Revision: 606610
URL: http://svn.apache.org/viewvc?rev=606610&view=rev
Log:
Fix bug 43236. After resetting the response, allow the character set to be
changed.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606610&r1=606609&r2=606610&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec 23 12:16:08 2007
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43236
- Reset usingWriter and associated flags when response is reset
- http://svn.apache.org/viewvc?rev=605364&view=rev
- +1: markt, pero, fhanik
- -1:
-
* Smallest fix to the above patches.
http://people.apache.org/~jfclere/patches/Request.patch
+1: jfclere, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=606610&r1=606609&r2=606610&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java Sun
Dec 23 12:16:08 2007
@@ -657,6 +657,9 @@
coyoteResponse.reset();
outputBuffer.reset();
+ usingOutputStream = false;
+ usingWriter = false;
+ isCharacterEncodingSet = false;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=606610&r1=606609&r2=606610&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Dec 23 12:16:08 2007
@@ -39,6 +39,11 @@
Fix handling of CometEvent.close when called during BEGIN event
(fhanik)
</update>
<fix>
+ <bug>43236</bug>: When resetting the response, also reset the flags
+ associated with using a writer or an output stream to allow the user to
+ change character set after the reset. (markt)
+ </fix>
+ <fix>
<bug>43241</bug>: Make ServletContext.getResourceAsStream() conform to
the specification. Patch provided by John Kew. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
