httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r161691 - in httpd/httpd/trunk: CHANGES modules/filters/mod_deflate.c
Date Sun, 17 Apr 2005 20:25:58 GMT
Author: pquerna
Date: Sun Apr 17 13:25:57 2005
New Revision: 161691

URL: http://svn.apache.org/viewcvs?view=rev&rev=161691
Log:
mod_deflate should be merging the Vary header, not Setting it, and ignoring what other modules
put there.

Spotted By: Rici Lake

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/filters/mod_deflate.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=161690&r2=161691
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Sun Apr 17 13:25:57 2005
@@ -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

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/mod_deflate.c?view=diff&r1=161690&r2=161691
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Sun Apr 17 13:25:57 2005
@@ -315,7 +315,7 @@
          * 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.



Mime
View raw message