Merge r580060 from trunk:

Fix adding out Via header in proxy response
PR 19439

Submitted by: niq
Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index 00e9cae588d4fea5d748c12af134dddfb4e9d4a1..2a1f29a9064d5c5f2bcaadada882f2a61ae6f98b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) mod_proxy_http: add Via header correctly (if enabled) to
+     response, even where other Via headers exist.
+     PR 19439 [Nick Kew]
+
   *) http_core: OPTIONS * no longer maps to local storage or URI
      space. PR 43519 [Jim Jagielski]
 

diff --git a/STATUS b/STATUS
index 8d8644f8c875160ae6c05d16381ebceeedafeb46..28edd89de39dbdea81c3bf9fe0a06ae3aae5d8ba 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,12 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_http: add Via header correctly (if enabled) to
-     response, even where other Via headers exist.
-     PR 19439
-     http://svn.apache.org/viewvc?view=rev&revision=580060
-     +1: niq, rpluem, jim
-
    * mod_proxy_http: Correctly parse all Connection headers in proxy.
      PR 43509
      trunk: http://svn.apache.org/viewvc?view=rev&revision=580457

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index cc1d8ce7f7c1d0bcbffd8f5deb0cb60f193bc009..d88881756e2015b287c2c5da127c88a27d3b1880 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1394,8 +1394,8 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                 if (server_name == r->hostname)
                     server_name = r->server->server_hostname;
                 /* create a "Via:" response header entry and merge it */
-                apr_table_mergen(r->headers_out, "Via",
-                                 (conf->viaopt == via_full)
+                apr_table_addn(r->headers_out, "Via",
+                               (conf->viaopt == via_full)
                                      ? apr_psprintf(p, "%d.%d %s%s (%s)",
                                            HTTP_VERSION_MAJOR(r->proto_num),
                                            HTTP_VERSION_MINOR(r->proto_num),