Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191

No way to turn off compression for some file types.
Based on a patch by Len Popp

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@653032 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 250dc8e..b1908ac 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -442,6 +442,7 @@ public class Http11AprProcessor implements ActionHook {
      */
     public void setCompressableMimeTypes(String compressableMimeTypes) {
         if (compressableMimeTypes != null) {
+            this.compressableMimeTypes = null;
             StringTokenizer st = new StringTokenizer(compressableMimeTypes, ",");
 
             while (st.hasMoreTokens()) {

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 008e348..5214336 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -449,6 +449,7 @@ public class Http11NioProcessor implements ActionHook {
      */
     public void setCompressableMimeTypes(String compressableMimeTypes) {
         if (compressableMimeTypes != null) {
+            this.compressableMimeTypes = null;
             StringTokenizer st = new StringTokenizer(compressableMimeTypes, ",");
 
             while (st.hasMoreTokens()) {

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 6ac15ad..673087e 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -432,6 +432,7 @@ public class Http11Processor implements ActionHook {
      */
     public void setCompressableMimeTypes(String compressableMimeTypes) {
         if (compressableMimeTypes != null) {
+            this.compressableMimeTypes = null;
             StringTokenizer st = new StringTokenizer(compressableMimeTypes, ",");
 
             while (st.hasMoreTokens()) {