Author: kkolinko
Date: Tue Aug 28 23:15:59 2012
New Revision: 1378378
URL: http://svn.apache.org/viewvc?rev=1378378&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53725#c3
Fix FlushableGZIPOutputStream.
It might be that the input has been consumed already,
but encoder still produces data from its internal buffer.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
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=1378378&r1=1378377&r2=1378378&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
Tue Aug 28 23:15:59 2012
@@ -137,6 +137,6 @@ public class FlushableGZIPOutputStream e
if (len > 0) {
out.write(buf, 0, len);
}
- } while (!def.needsInput());
+ } while (len > 0 || !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=1378378&r1=1378377&r2=1378378&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 28 23:15:59 2012
@@ -211,7 +211,8 @@
(markt)
</fix>
<fix>
- <bug>53725</bug>: Fix possible corruption of GZIP'd output. (markt)
+ <bug>53725</bug>: Fix possible corruption of GZIP'd output.
+ (markt/kkolinko)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
