deflate's filter removal was reversed for non-html files, resulting

in it never being applied for non-html files
Submitted by:	Kris Verbeeck <Kris.Verbeeck@ubizen.com>

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

diff --git a/CHANGES b/CHANGES
index af32a05ec3583682a979b6823a5f45d74145ef89..bbba4e82b477d4692ded35944e32f6129fd3e985 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.41
 
+  *) Fix Logic on non-html file removal in mod_deflate
+     [Kris Verbeeck <Kris.Verbeeck@ubizen.com>]
+
   *) Fix "ab -g"'s truncated year: the last digit was cut off.
      [Leon Brocard <acme@astray.com>]
 

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index a456b0258eacd47b1fb28e4789768b5fe5df9fa9..d7a7e2a9d42c91b2344546c49e13cdf966a39b6b 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -281,7 +281,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
              || strncmp(r->content_type, "text/html", 9)) {
             const char *env_value = apr_table_get(r->subprocess_env,
                                                   "gzip-only-text/html");
-            if ( env_value == NULL || strcmp(env_value,"1") ) {
+            if ( env_value && (strcmp(env_value,"1") == 0) ) {
                 ap_remove_output_filter(f);
             }
             return ap_pass_brigade(f->next, bb);