[jbossweb-commits] JBossWeb SVN: r720 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2008-07-17 18:25:15 -0400 (Thu, 17 Jul 2008)
New Revision: 720
Modified:
trunk/java/org/apache/catalina/connector/CoyoteReader.java
trunk/webapps/docs/changelog.xml
Log:
- Port patch: problems with certain long lines.
Modified: trunk/java/org/apache/catalina/connector/CoyoteReader.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteReader.java 2008-07-17 18:05:56 UTC
(rev 719)
+++ trunk/java/org/apache/catalina/connector/CoyoteReader.java 2008-07-17 22:25:15 UTC
(rev 720)
@@ -156,7 +156,7 @@
mark(MAX_LINE_LENGTH);
while ((pos < MAX_LINE_LENGTH) && (end < 0)) {
int nRead = read(lineBuffer, pos, MAX_LINE_LENGTH - pos);
- if (nRead < 0) {
+ if (nRead < 0 && aggregator == null) {
if (pos == 0) {
return null;
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-07-17 18:05:56 UTC (rev 719)
+++ trunk/webapps/docs/changelog.xml 2008-07-17 22:25:15 UTC (rev 720)
@@ -46,6 +46,10 @@
org.jboss.web should be loaded as container classes. (remm)
</fix>
<fix>
+ <bug>42727</bug>: Handle request lines that are exact multiples of
4096 in length.
+ Patch provided by Will Pugh. (markt)
+ </fix>
+ <fix>
Instance manager checks were not done properly. (remm)
</fix>
<fix>