Another fix for the multiple-cookie header bug in proxy. With some

luck this bug is actually now dead.
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@94164 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index cf59238f557f9af690658dc7adaa156a866f36bf..5a6cbe3914d05ca3ea2a11922a4c07aa34156b4d 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.25
 
+  *) Another fix for the multiple-cookie header bug in proxy. With some
+     luck this bug is actually now dead. [Graham Leggett]
+
 Changes with Apache 1.3.24
 
   *) Fixed a segfault in mod_include when #if, #elif, #else, or #endif

diff --git a/src/modules/proxy/proxy_http.c b/src/modules/proxy/proxy_http.c
index 04eff05e8ed6fd5ab43b68e8804923cec84cac54..6d4241d41288b9f2f585f63522728eec39dd373e 100644 (file)
--- a/src/modules/proxy/proxy_http.c
+++ b/src/modules/proxy/proxy_http.c
@@ -544,7 +544,7 @@ int ap_proxy_http_handler(request_rec *r, cache_req *c, char *url,
     }
 
     /* Setup the headers for our client from upstreams response-headers */
-    ap_overlap_tables(r->headers_out, resp_hdrs, AP_OVERLAP_TABLES_SET);
+    ap_proxy_table_replace(r->headers_out, resp_hdrs);
     /* Add X-Cache header - be careful not to obliterate any upstream headers */
     ap_table_mergen(r->headers_out, "X-Cache",
                     ap_pstrcat(r->pool, "MISS from ",