You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/09/27 17:21:14 UTC
svn commit: r580060 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy_http.c
Author: niq
Date: Thu Sep 27 08:21:12 2007
New Revision: 580060
URL: http://svn.apache.org/viewvc?rev=580060&view=rev
Log:
Fix adding out Via header in proxy response
PR 19439
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=580060&r1=580059&r2=580060&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Sep 27 08:21:12 2007
@@ -2,6 +2,10 @@
Changes with Apache 2.3.0
[ When backported to 2.2.x, remove entry from this file ]
+ *) mod_proxy_http: add Via header correctly (if enabled) to
+ response, even where other Via headers exist.
+ PR 19439 [Nick Kew]
+
*) mod_proxy_http: strip hop-by-hop response headers
PR 43455 [Nick Kew]
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=580060&r1=580059&r2=580060&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Thu Sep 27 08:21:12 2007
@@ -1388,8 +1388,8 @@
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),