Author: markt
Date: Wed Apr 16 14:52:38 2008
New Revision: 648868
URL: http://svn.apache.org/viewvc?rev=648868&view=rev
Log:
More 44494.
Fix read when maxHttpHeaderSize > 8192
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648868&r1=648867&r2=648868&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:52:38 2008
@@ -91,12 +91,6 @@
+1: markt, remm
-1:
-* Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
- Fix read when maxHttpHeaderSize > 8192
- http://svn.apache.org/viewvc?rev=647304&view=rev (rjung)
- +1: markt, remm, rjung
- -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.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=648868&r1=648867&r2=648868&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Wed Apr 16 14:52:38 2008
@@ -367,7 +367,9 @@
cb.setOffset(0);
cb.setEnd(0);
}
-
+ int limit = bb.getLength()+cb.getStart();
+ if ( cb.getLimit() < limit )
+ cb.setLimit(limit);
state = CHAR_STATE;
conv.convert(bb, cb, bb.getLength());
bb.setOffset(bb.getEnd());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
