Check also for r->content_encoding (now we should have them all...)

for already compressed content in mod_deflate.

PR: 19913
Submitted by: Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>
Reviewed by: Jeff Trawick, Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index ff3decb7fd93f747077775e247dc84929500c8a1..1dae2aab8a88017449377a75a237b671d71b20af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.46
 
+  *) Add another check for already compressed content in mod_deflate.
+     PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]
+
   *) Fixes for VPATH builds; copying special.mk and any future .mk files 
      from the source tree as well as the build tree (now creates a usable
      configuration for apxs), and eliminated redundant -I'nclude paths.
@@ -24,7 +27,7 @@ Changes with Apache 2.0.46
   *) mod_log_config: Add the ability to log the id of the thread 
      processing the request via new %P formats.  [Jeff Trawick]
 
-  *) Use appropriate language code for Czech (cs) and Traditional Chinese
+  *) Use appropriate language codes for Czech (cs) and Traditional Chinese
      (zh-tw) in default config files. PR 9427.  [André Malo]
 
   *) mod_auth_ldap: Use generic whitespace character class when parsing

diff --git a/STATUS b/STATUS
index 41fcc2a2a84668449358ccc0e7d15f9a28e7c25e..76dbcedf2f9161597980e9cc4bd8ec6fdeaf6715 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/05/17 17:14:04 $]
+Last modified at [$Date: 2003/05/17 18:27:42 $]
 
 Release:
 
@@ -198,11 +198,6 @@ PATCHES TO PORT FROM 2.1
       modules/ssl/ssl_engine_io.c r1.106, r1.107 (minor breakage)
       +1: wrowe, jerenkrantz
       
-    * Add another check for already compressed content in mod_deflate.
-      PR 19913.
-      modules/filters/mod_deflate.c: r1.34
-      +1: nd, trawick, jerenkrantz
-
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index c8d8ae9b0dfba3e57245f7098bf4fe4b28574dd8..1285da8f58da9bbe8c1bbb7f27558f560dac0f07 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -340,6 +340,12 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
             encoding = apr_table_get(r->err_headers_out, "Content-Encoding");
         }
 
+        if (r->content_encoding) {
+            encoding = encoding ? apr_pstrcat(r->pool, encoding, ",",
+                                              r->content_encoding, NULL)
+                                : r->content_encoding;
+        }
+
         if (encoding) {
             const char *tmp = encoding;