From: Colm MacCarthaigh Date: Mon, 23 Jan 2006 20:37:29 +0000 (+0000) Subject: Merge r161691 from trunk: X-Git-Tag: 2.0.56~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0fe8e5cf968a1bbba019a704aa3af3373091200;p=thirdparty%2Fapache%2Fhttpd.git 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371657 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 906fd9d639b..90b2594432a 100644 --- a/CHANGES +++ b/CHANGES @@ -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 ] diff --git a/STATUS b/STATUS index f880e9025f4..16c5ec737bc 100644 --- a/STATUS +++ b/STATUS @@ -133,14 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 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 diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c index aeff8f590e9..595b284bd53 100644 --- a/modules/filters/mod_deflate.c +++ b/modules/filters/mod_deflate.c @@ -336,7 +336,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"); /* if they don't have the line, then they can't play */ accepts = apr_table_get(r->headers_in, "Accept-Encoding");