Author: kkolinko Date: Mon Oct 20 12:37:41 2014 New Revision: 1633132 URL: http://svn.apache.org/r1633132 Log: Do not increase remaining counter at end of stream in IdentityInputFilter.
Merged r1633128 from tomcat/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1633128 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1633132&r1=1633131&r2=1633132&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java Mon Oct 20 12:37:41 2014 @@ -145,7 +145,9 @@ public class IdentityInputFilter impleme } else { result = nRead; } - remaining = remaining - nRead; + if (nRead > 0) { + remaining = remaining - nRead; + } } else { // No more bytes left to be read : return -1 and clear the // buffer Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1633132&r1=1633131&r2=1633132&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 20 12:37:41 2014 @@ -89,6 +89,10 @@ <add> Disable SSLv3 by default for the APR/native HTTPS connector. (markt) </add> + <fix> + Do not increase remaining counter at end of stream in + IdentityInputFilter. (kkolinko) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org