From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 15 Dec 2008 20:45:29 +0000 (+0000)
Subject: * Correctly save Content-Encoding of cachable entity.
X-Git-Tag: 2.3.1~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8433cdfe676e513f8e7c377803a134ac68c70a7f;p=thirdparty%2Fapache%2Fhttpd.git

* Correctly save Content-Encoding of cachable entity.

PR: 46401
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem


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

diff --git a/CHANGES b/CHANGES
index 557281f2ae2..f2c1a96f5ba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.1
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401
+     [Dan Poirier <poirier pobox.com>]
+
   *) mod_cgid: Do not add an empty argument when calling the CGI script.
      PR 46380 [Ruediger Pluem]
 
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index 1fe7d0f5bd7..bc8dbd8f514 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -668,5 +668,11 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers_out(request_rec *r)
                        ap_make_content_type(r, r->content_type));
     }
 
+    if (!apr_table_get(headers_out, "Content-Encoding")
+        && r->content_encoding) {
+        apr_table_setn(headers_out, "Content-Encoding",
+                       r->content_encoding);
+    }
+
     return headers_out;
 }