Author: markt Date: Sat Aug 25 20:08:41 2012 New Revision: 1377343 URL: http://svn.apache.org/viewvc?rev=1377343&view=rev Log: Fix corruption in some GZIP'd content
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1377342 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1377343&r1=1377342&r2=1377343&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java Sat Aug 25 20:08:41 2012 @@ -137,7 +137,6 @@ public class FlushableGZIPOutputStream e if (len > 0) { out.write(buf, 0, len); } - } while (len != 0); + } while (!def.needsInput()); } - } 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=1377343&r1=1377342&r2=1377343&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 25 20:08:41 2012 @@ -179,6 +179,9 @@ <code>NullPointerException</code> and could result in a JVM crash. (markt) </fix> + <fix> + <bug>53725</bug>: Fix possible corruption of GZIP'd output. (markt) + </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