svn commit: r1637079 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/filters/IdentityInputFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov  6 11:19:27 2014
New Revision: 1637079

URL: http://svn.apache.org/r1637079
Log:
Do not increase remaining counter at end of stream in IdentityInputFilter.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.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=1637079&r1=1637078&r2=1637079&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov  6 11:19:27 2014
@@ -82,11 +82,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, schultz, markt
   -1:
 
-* Do not increase remaining counter at end of stream in IdentityInputFilter.
-  http://svn.apache.org/r1633132
-  +1: kkolinko, schultz, markt
-  -1:
-
 
 PATCHES/ISSUES THAT ARE STALLED:
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1637079&r1=1637078&r2=1637079&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
 Thu Nov  6 11:19:27 2014
@@ -124,7 +124,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1637079&r1=1637078&r2=1637079&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov  6 11:19:27 2014
@@ -47,6 +47,10 @@
   <subsection name="Coyote">
     <changelog>
       <fix>
+        <bug>53952</bug>: Add support for TLSv1.1 and TLSv1.2 for APR 
connector.
+        Based upon a patch by Marcel &#352;ebek. (schultz/jfclere)
+      </fix>
+      <fix>
         <bug>57102</bug>: Fix bug that meant sslEnabledProtocols setting was 
not
         recognised for the HTTPS NIO connector. (markt)
       </fix>
@@ -55,8 +59,8 @@
         (markt/schultz)
       </add>
       <fix>
-        <bug>53952</bug>: Add support for TLSv1.1 and TLSv1.2 for APR 
connector.
-        Based upon a patch by Marcel &#352;ebek. (schultz/jfclere)
+        Do not increase remaining counter at end of stream in
+        IdentityInputFilter. (kkolinko)
       </fix>
     </changelog>
   </subsection>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org