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>

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

diff --git a/CHANGES b/CHANGES
index 8e7682bfa4db20a43c729478f9b1cbd1a1b0a223..e27701d8aa2825458667739f325fd3da7f5be831 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Add another check for already compressed content in mod_deflate.
+     PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]
+
   *) Add a delete flag to htpasswd.
      [Thom May]
 

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;