Author: markt
Date: Wed Apr 16 14:55:30 2008
New Revision: 648869
URL: http://svn.apache.org/viewvc?rev=648869&view=rev
Log:
Last (hopefully) fix for bug 44494
Clear buffer if not all data is read.
Patch provided by Suzuki Yuichiro.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648869&r1=648868&r2=648869&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:55:30 2008
@@ -91,15 +91,6 @@
+1: markt, remm
-1:
-* Last (hopefully) fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
- Clear buffer if not all data is read.
- Patch provided by Suzuki Yuichiro.
- http://svn.apache.org/viewvc?rev=647307&view=rev
- +1: markt, remm, rjung
- -1:
- rjung: Not sure, if this is the most efficient solution, but
- at least it's a fix.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44391
Handling of escaped characters was incorrect.
http://svn.apache.org/viewvc?rev=647316&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=648869&r1=648868&r2=648869&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Wed
Apr 16 14:55:30 2008
@@ -218,6 +218,14 @@
/** Reset the buffer
*/
public final void recycle() {
+ try {
+ // Must clear super's buffer.
+ while (ready()) {
+ // InputStreamReader#skip(long) will allocate buffer to skip.
+ read();
+ }
+ } catch(IOException ioe){
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
