Author: markt
Date: Wed Aug 10 22:25:32 2016
New Revision: 1755884
URL: http://svn.apache.org/viewvc?rev=1755884&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59912
Fix an edge case in input stream handling where an IOException could be thrown
when reading a POST body.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1755884&r1=1755883&r2=1755884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Wed Aug 10
22:25:32 2016
@@ -380,7 +380,7 @@ public class InputBuffer extends Reader
} else {
// Make sure there's enough space in the worst case
cb.makeSpace(bb.getLength());
- if ((cb.getBuffer().length - cb.getEnd()) == 0) {
+ if ((cb.getBuffer().length - cb.getEnd()) == 0 && bb.getLength()
!= 0) {
// We went over the limit
cb.setOffset(0);
cb.setEnd(0);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1755884&r1=1755883&r2=1755884&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 10 22:25:32 2016
@@ -113,6 +113,11 @@
onwards. (markt)
</fix>
<fix>
+ <bug>59912</bug>: Fix an edge case in input stream handling where an
+ <code>IOException</code> could be thrown when reading a POST body.
+ (markt)
+ </fix>
+ <fix>
<bug>59913</bug>: Correct a regression introduced with the support for
the Servlet 4 <code>HttpServletRequest.getMapping()</code> API that
caused the attributes for forwarded requests to be lost if requested
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
