Backport to close PR 11540

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

3 files changed, 13 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index 8c522e7e5c..8c90ec6016 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.60
 
+  *) mod_proxy: ProxyTimeout (and others) ignored due to not merging
+     the *_set params. PR 11540. [Jim Jagielski]
+
   *) mod_isapi: Correctly present SERVER_PORT_SECURE.
-     PR: 40573.  [Matt Eaton <asf divinehawk.com>]
+     PR 40573.  [Matt Eaton <asf divinehawk.com>]
 
   *) mod_isapi: Avoid double trailing slashes in HSE_REQ_MAP_URL_TO_PATH
      support.  Also corrects the slashes for Windows.  PR 15993. [William Rowe]
diff --git a/STATUS b/STATUS
index 214fe9f942..150b9b7607 100644
--- a/STATUS
+++ b/STATUS
@@ -110,14 +110,6 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-    * mod_proxy: ProxyTimeout (and others) ignored due to not merging
-      the *_set params.
-      PR# 11540
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=507516
-      2.0 version:
-         http://people.apache.org/~jim/patches/httpd-2.0-proxy.patch
-      +1: jim, minfrin, wrowe
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 4600194a8b..aa51c30cab 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -517,14 +517,23 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv)
 
     ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;
     ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;
+    ps->viaopt_set = overrides->viaopt_set || base->viaopt_set;
     ps->req = (overrides->req_set == 0) ? base->req : overrides->req;
+    ps->req_set = overrides->req_set || base->req_set;
     ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size;
+    ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set;
     ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size;
+    ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set;
     ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd;
+    ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set;
     ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override;
+    ps->error_override_set = overrides->error_override_set || base->error_override_set;
     ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host;
+    ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set;
     ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
+    ps->timeout_set = overrides->timeout_set || base->timeout_set;
     ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
+    ps->badopt_set = overrides->badopt_set || base->badopt_set;
 
     return ps;
 }