Author: kkolinko Date: Fri Jun 1 23:06:21 2012 New Revision: 1345389 URL: http://svn.apache.org/viewvc?rev=1345389&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14 Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is recycled.
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=1345389&r1=1345388&r2=1345389&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 1 23:06:21 2012 @@ -162,14 +162,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: -* https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14 - Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is - recycled. - http://svn.apache.org/viewvc?rev=1342795&view=rev - (r1342797 in Tomcat 7) - +1: kkolinko, markt, kfujino - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53267 Ensure that using the GC Daemon Protection feature of the <code>JreMemoryLeakPreventionListener</code> does not trigger a 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=1345389&r1=1345388&r2=1345389&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 Fri Jun 1 23:06:21 2012 @@ -243,6 +243,7 @@ public class ChunkedInputFilter implemen pos = 0; lastValid = 0; endChunk = false; + needCRLFParse = false; trailingHeaders.recycle(); } 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=1345389&r1=1345388&r2=1345389&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 23:06:21 2012 @@ -131,6 +131,10 @@ or later. (rjung) </update> <fix> + <bug>52055#c14</bug>: Correctly reset ChunkedInputFilter.needCRLFParse + flag when the filter is recycled. (kkolinko) + </fix> + <fix> <bug>52606</bug>: Ensure replayed POST bodies are available when using AJP. (markt) </fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org