Author: fhanik
Date: Mon Jul 21 10:11:50 2008
New Revision: 678487
URL: http://svn.apache.org/viewvc?rev=678487&view=rev
Log:
fix request line handling
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteReader.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=678487&r1=678486&r2=678487&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 21 10:11:50 2008
@@ -53,10 +53,3 @@
http://svn.apache.org/viewvc?rev=677473&view=rev
+1: 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, remm, fhanik
- -1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteReader.java?rev=678487&r1=678486&r2=678487&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteReader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteReader.java
Mon Jul 21 10:11:50 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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=678487&r1=678486&r2=678487&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jul 21 10:11:50 2008
@@ -35,6 +35,8 @@
<section name="Tomcat 6.0.18 (remm)">
<subsection name="Cataina">
<changelog>
+ <fix><bug>42727</bug>Correctly handle request lines that are exact
multiples of 4096 in length.
+ Patch provided by Will Pugh.</fix>
<fix>
<bug>42678</bug>: Only ignore docBase it it really is a subdir of
appBase. Patch provided by juergen. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
