Commit fb396509 authored by Paul Querna's avatar Paul Querna
Browse files

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

mod_deflate should be merging the Vary header, not Setting it, and ignoring what other modules put there.

Spotted By: Rici Lake


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

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,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















     large.

































modules/filters/mod_deflate.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -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.