From: André Malo <nd@apache.org>
Date: Fri, 16 May 2003 22:49:04 +0000 (+0000)
Subject: Check also for r->content_encoding (now we should have them all...)
X-Git-Tag: pre_ajp_proxy~1680
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c039aae0498c694710a5510843e755be574e806;p=thirdparty%2Fapache%2Fhttpd.git

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 8e7682bfa4d..e27701d8aa2 100644
--- 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 c8d8ae9b0df..1285da8f58d 100644
--- 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;