Author: jfclere Date: Sat Apr 27 09:57:34 2013 New Revision: 1476544 URL: http://svn.apache.org/r1476544 Log: commit accepted patch for BZ 54456
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.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=1476544&r1=1476543&r2=1476544&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 27 09:57:34 2013 @@ -73,14 +73,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, schultz -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54456 - If the client aborts the request, make sure this is communicated to the - application reading the request body. - http://svn.apache.org/viewvc?rev=1443430&view=rev - (r1443427 in trunk) - +1: kkolinko, markt, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54601 Change catalina.sh to consistently use LOGGING_MANAGER variable to configure logging, instead of modifying JAVA_OPTS one. Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1476544&r1=1476543&r2=1476544&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Sat Apr 27 09:57:34 2013 @@ -164,7 +164,10 @@ public class ChunkedInputFilter implemen int result = 0; if (pos >= lastValid) { - readBytes(); + if (readBytes() < 0) { + throw new IOException( + "Unexpected end of stream whilst reading request body"); + } } if (remaining > (lastValid - pos)) { @@ -378,7 +381,7 @@ public class ChunkedInputFilter implemen */ protected boolean parseEndChunk() throws IOException { - // Handle option trailer headers + // Handle optional trailer headers while (parseHeader()) { // Loop until we run out of headers } 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=1476544&r1=1476543&r2=1476544&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 09:57:34 2013 @@ -86,6 +86,11 @@ <subsection name="Coyote"> <changelog> <fix> + <bug>54456</bug>: Ensure that if a client aborts a request when sending + a chunked request body that this is communicated correctly to the client + reading the request body. (markt) + </fix> + <fix> <bug>54248</bug>: Ensure that byte order marks are swallowed when using a Reader to read a request body with a BOM for those encodings that require byte order marks. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org