You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/11 22:19:08 UTC
svn commit: r1522020 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt
java/org/apache/coyote/http11/InternalNioInputBuffer.java
webapps/docs/changelog.xml
Author: markt
Date: Wed Sep 11 20:19:07 2013
New Revision: 1522020
URL: http://svn.apache.org/r1522020
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54947
NIO connector incorrectly rejects a request if the CRLF terminating the request line is split across multiple packets.
Patch by Konstantin Preißer.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1486875
Merged /tomcat/tc7.0.x/trunk:r1486877
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1522020&r1=1522019&r2=1522020&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 11 20:19:07 2013
@@ -32,14 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54947
- http://svn.apache.org/r1486877
- NIO connector incorrectly rejects a request if the CRLF terminating the
- request line is split across multiple packets.
- Patch for the fix by Konstantin Preißer (Preisser).
- +1: markt, kkolinko, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55198
Correctly escape XML output from tagx files.
http://svn.apache.org/r1500065 (excluding tests)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1522020&r1=1522019&r2=1522020&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Wed Sep 11 20:19:07 2013
@@ -567,11 +567,11 @@ public class InternalNioInputBuffer impl
}
parsingRequestLineStart = pos;
parsingRequestLinePhase = 6;
- }
- if (parsingRequestLinePhase == 6) {
+
// Mark the current buffer position
-
end = 0;
+ }
+ if (parsingRequestLinePhase == 6) {
//
// Reading the protocol
// Protocol is always US-ASCII
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=1522020&r1=1522019&r2=1522020&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep 11 20:19:07 2013
@@ -71,6 +71,11 @@
and "sslProtocols". Those names of this attribute are now deprecated).
(schultz)
</fix>
+ <fix>
+ <bug>54947</bug>: Fix the HTTP NIO connector that incorrectly rejected a
+ request if the CRLF terminating the request line was split across
+ multiple packets. Patch by Konstantin PreiÃer. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org