svn commit: r371657 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/filters/mod_deflate.c

[co...@apache.org]

Author: colm
Date: Mon Jan 23 12:37:29 2006
New Revision: 371657

URL: http://svn.apache.org/viewcvs?rev=371657&view=rev
Log:

Merge r161691 from trunk:

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

Spotted By: Rici Lake
Submitted by: pquerna

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/filters/mod_deflate.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=371657&r1=371656&r2=371657&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon Jan 23 12:37:29 2006
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) mod_deflate: Merge the Vary header, instead of Setting it. Fixes
+     applications that send the Vary Header themselves. PR 37559. 
+     [Paul Querna]
+
   *) mod_dav: Fix a null pointer dereference in an error code path during the
      handling of MKCOL. [Ghassan Misherghi <ghassanm ucdavis.edu>]
 

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=371657&r1=371656&r2=371657&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon Jan 23 12:37:29 2006
@@ -133,14 +133,6 @@
          http://svn.apache.org/viewcvs?view=rev&rev=154319
        +1: stoddard, striker, wrowe (as corrected in subsequent patches)
 
-    *) mod_deflate: Fix PR37559 (mod_deflate + mod_proxy overwrite the
-       Vary: header)
-       Trunk version of patch:
-          http://svn.apache.org/viewcvs.cgi?rev=161691&view=rev
-       Backport version for 2.0.x of patch:
-          http://issues.apache.org/bugzilla/attachment.cgi?id=16995
-       +1: rpluem, colm, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

Modified: httpd/httpd/branches/2.0.x/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/filters/mod_deflate.c?rev=371657&r1=371656&r2=371657&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/branches/2.0.x/modules/filters/mod_deflate.c Mon Jan 23 12:37:29 2006
@@ -336,7 +336,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");
 
         /* if they don't have the line, then they can't play */
         accepts = apr_table_get(r->headers_in, "Accept-Encoding");