mod_deflate should be merging the Vary header, not Setting it, and ignoring what...

Spotted By: Rici Lake

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

diff --git a/CHANGES b/CHANGES
index 0d23ab4ecf0a9c579f0b80cd2bad1b513bc1f3bd..68e4021ee139a7cb9f2b00e97c71cdd12d8e5c4a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
+  
+  *) mod_deflate: Merge the Vary header, isntead of Setting it. Fixes
+     applications that send the Vary Header themselves, and also apply 
+     mod_defalte as an output filter. [Paul Querna]
 
   *) mod_rewrite: use buffered I/O for RewriteMap txt: files.  This
      can result in a major performance improvement when the files are

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index eb2225f69d99d391fc5aa9f70febf8e7809a5e93..34917705fac9155130a82f580b33befca90fcc63 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -315,7 +315,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
          * the Accept-Encoding, we need to note that we were looking
          * for this header and downstream proxies should be aware of that.
          */
-        apr_table_setn(r->headers_out, "Vary", "Accept-Encoding");
+        apr_table_mergen(r->headers_out, "Vary", "Accept-Encoding");
 
         /* force-gzip will just force it out regardless if the browser
          * can actually do anything with it.