From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Dec 2012 14:25:46 +0000 (+0000)
Subject: restrict inherit control to those fields that "require" it...
X-Git-Tag: 2.5.0-alpha~5977
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26036be3a5fd6337eb605975f10d7846a0882d4f;p=thirdparty%2Fapache%2Fhttpd.git

restrict inherit control to those fields that "require" it...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422943 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index dee15bc0d5e..7be65dcd7d5 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1191,21 +1191,16 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv)
     ps->inherit = (overrides->inherit_set == 0) ? base->inherit : overrides->inherit;
     ps->inherit_set = overrides->inherit_set || base->inherit_set;
 
+    ps->proxies = apr_array_append(p, base->proxies, overrides->proxies);
+    ps->sec_proxy = apr_array_append(p, base->sec_proxy, overrides->sec_proxy);
+    ps->aliases = apr_array_append(p, base->aliases, overrides->aliases);
+    ps->noproxies = apr_array_append(p, base->noproxies, overrides->noproxies);
+    ps->dirconn = apr_array_append(p, base->dirconn, overrides->dirconn);
     if (ps->inherit) {
-        ps->proxies = apr_array_append(p, base->proxies, overrides->proxies);
-        ps->sec_proxy = apr_array_append(p, base->sec_proxy, overrides->sec_proxy);
-        ps->aliases = apr_array_append(p, base->aliases, overrides->aliases);
-        ps->noproxies = apr_array_append(p, base->noproxies, overrides->noproxies);
-        ps->dirconn = apr_array_append(p, base->dirconn, overrides->dirconn);
         ps->workers = apr_array_append(p, base->workers, overrides->workers);
         ps->balancers = apr_array_append(p, base->balancers, overrides->balancers);
     }
     else {
-        ps->proxies = overrides->proxies;
-        ps->sec_proxy = overrides->sec_proxy;
-        ps->aliases = overrides->aliases;
-        ps->noproxies = overrides->noproxies;
-        ps->dirconn = overrides->dirconn;
         ps->workers = overrides->workers;
         ps->balancers = overrides->balancers;
     }