remm 2005/08/19 01:00:37
Modified: http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
webapps/docs changelog.xml
Log:
- Disable the built-in HTTP compression when sendfile is used for a resource.
Revision Changes Path
1.32 +1 -2
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Http11AprProcessor.java 4 Aug 2005 07:07:57 -0000 1.31
+++ Http11AprProcessor.java 19 Aug 2005 08:00:37 -0000 1.32
@@ -1583,9 +1583,8 @@
// Check for compression
boolean useCompression = false;
- if (entityBody && (compressionLevel > 0)) {
+ if (entityBody && (compressionLevel > 0) && (sendfileData == null)) {
useCompression = isCompressable();
-
// Change content-length to -1 to force chunking
if (useCompression) {
response.setContentLength(-1);
1.360 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- changelog.xml 18 Aug 2005 13:25:18 -0000 1.359
+++ changelog.xml 19 Aug 2005 08:00:37 -0000 1.360
@@ -129,6 +129,9 @@
<bug>36173</bug>: Add missing sync in FastHttpDateFormat.formatDate,
submitted
by Alexei Krainiouk (remm)
</fix>
+ <fix>
+ Disable HTTP compression when sendfile is used for a resource (remm)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
