Author: markt
Date: Wed Aug 25 16:36:21 2010
New Revision: 989208
URL: http://svn.apache.org/viewvc?rev=989208&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49718 a regression
causes by wrongly applying the patch for
https://issues.apache.org/bugzilla/show_bug.cgi?id=46984. The regression broke
HTTP 0.9 requests.
CTR since the correct patch has already been approved.
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=989208&r1=989207&r2=989208&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Wed Aug 25 16:36:21 2010
@@ -482,6 +482,12 @@ public class InternalAprInputBuffer impl
throw new EOFException(sm.getString("iib.eof.error"));
}
+ // Spec says no CR or LF in method name
+ if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
+ throw new IllegalArgumentException(
+ sm.getString("iib.invalidmethod"));
+ }
+
ascbuf[pos] = (char) buf[pos];
// Spec says single SP but it also says be tolerant of HT
@@ -527,11 +533,6 @@ public class InternalAprInputBuffer impl
throw new EOFException(sm.getString("iib.eof.error"));
}
- // Spec says no CR or LF in method name
- if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
- throw new IllegalArgumentException(
- sm.getString("iib.invalidmethod"));
- }
// Spec says single SP but it also says be tolerant of HT
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=989208&r1=989207&r2=989208&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
Wed Aug 25 16:36:21 2010
@@ -424,6 +424,12 @@ public class InternalInputBuffer impleme
throw new EOFException(sm.getString("iib.eof.error"));
}
+ // Spec says no CR or LF in method name
+ if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
+ throw new IllegalArgumentException(
+ sm.getString("iib.invalidmethod"));
+ }
+
ascbuf[pos] = (char) buf[pos];
// Spec says single SP but it also says be tolerant of HT
@@ -469,11 +475,6 @@ public class InternalInputBuffer impleme
throw new EOFException(sm.getString("iib.eof.error"));
}
- // Spec says no CR or LF in method name
- if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
- throw new IllegalArgumentException(
- sm.getString("iib.invalidmethod"));
- }
// Spec says single SP but it also says be tolerant of HT
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=989208&r1=989207&r2=989208&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Aug 25
16:36:21 2010
@@ -47,6 +47,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>49718</bug>: Fix regression in previous fix for <bug>46984</bug>
+ caused by the patch being applied to the wrong section of code. The
+ regression caused HTTP 0.9 requests to fail. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Webapps">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
