Author: markt
Date: Thu Aug 14 02:32:26 2008
New Revision: 685833
URL: http://svn.apache.org/viewvc?rev=685833&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42727
Correctly handle request lines that are exact multiples of 4096 in length.
Patch provided by Will Pugh.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java?rev=685833&r1=685832&r2=685833&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java
Thu Aug 14 02:32:26 2008
@@ -153,7 +153,7 @@
while ((pos < MAX_LINE_LENGTH) && (end < 0)) {
int nRead = read(lineBuffer, pos, MAX_LINE_LENGTH - pos);
if (nRead < 0) {
- if (pos == 0) {
+ if (pos == 0 && aggregator == null) {
return null;
}
end = pos;
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=685833&r1=685832&r2=685833&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Aug 14 02:32:26 2008
@@ -110,6 +110,10 @@
mod_jk has hung up the phone. (billbarker)
</update>
<fix>
+ <bug>42727</bug>: Handle request lines that are exact multiples of 4096
+ in length. Patch provided by Will Pugh. (markt)
+ </fix>
+ <fix>
<bug>43191</bug>: Compression could not be disabled for some file
types.
Based on a patch by Len Popp. (markt)
</fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=685833&r1=685832&r2=685833&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Aug 14 02:32:26 2008
@@ -49,13 +49,6 @@
+1: markt, yoavs, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42727
- Correctly handle request lines that are exact multiples of 4096 in length.
- Patch provided by Will Pugh.
- http://svn.apache.org/viewvc?rev=677759&view=rev
- +1: markt, yoavs, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45453
Add required sync to race condition
Based on a patch by Santtu Hyrkk
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
