You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/05/15 21:35:13 UTC

svn commit: r656805 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/coyote/http11/Http11Processor.java webapps/docs/changelog.xml

Author: markt
Date: Thu May 15 12:35:12 2008
New Revision: 656805

URL: http://svn.apache.org/viewvc?rev=656805&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
No way to turn off compression for some mime-types
Based on a patch by Len Popp

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.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=656805&r1=656804&r2=656805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 12:35:12 2008
@@ -51,13 +51,6 @@
   +1: jfclere, rjung, fhanik, remm, pero
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
-  No way to turn off compression for some mime-types
-  Based on a patch by Len Popp
-  http://svn.apache.org/viewvc?rev=653032&view=rev
-  +1: markt, remm, billbarker
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117
   Setting an empty workDir can delete all of CATALINA_HOME
   Patch provided by Takayuki Kaneko.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=656805&r1=656804&r2=656805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu May 15 12:35:12 2008
@@ -442,6 +442,7 @@
      */
     public void setCompressableMimeTypes(String compressableMimeTypes) {
         if (compressableMimeTypes != null) {
+            this.compressableMimeTypes = null;
             StringTokenizer st = new StringTokenizer(compressableMimeTypes, ",");
 
             while (st.hasMoreTokens()) {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=656805&r1=656804&r2=656805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu May 15 12:35:12 2008
@@ -450,6 +450,7 @@
      */
     public void setCompressableMimeTypes(String compressableMimeTypes) {
         if (compressableMimeTypes != null) {
+            this.compressableMimeTypes = null;
             StringTokenizer st = new StringTokenizer(compressableMimeTypes, ",");
 
             while (st.hasMoreTokens()) {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=656805&r1=656804&r2=656805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu May 15 12:35:12 2008
@@ -432,6 +432,7 @@
      */
     public void setCompressableMimeTypes(String compressableMimeTypes) {
         if (compressableMimeTypes != null) {
+            this.compressableMimeTypes = null;
             StringTokenizer st = new StringTokenizer(compressableMimeTypes, ",");
 
             while (st.hasMoreTokens()) {

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=656805&r1=656804&r2=656805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 15 12:35:12 2008
@@ -159,6 +159,10 @@
         Caldarale. (markt/jim)
       </fix>
       <fix>
+        <bug>43191</bug>: Make it possible to override the defaults with the
+        compressableMimeType attribute. Based on a patch by Len Popp. (markt)
+      </fix>
+      <fix>
         <bug>44391</bug>: Correct handling of escaped values in SSI processing.
         (markt) 
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org