You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/12/17 15:25:46 UTC
svn commit: r1422943 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c
Author: jim
Date: Mon Dec 17 14:25:46 2012
New Revision: 1422943
URL: http://svn.apache.org/viewvc?rev=1422943&view=rev
Log:
restrict inherit control to those fields that "require" it...
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1422943&r1=1422942&r2=1422943&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Dec 17 14:25:46 2012
@@ -1191,21 +1191,16 @@ static void * merge_proxy_config(apr_poo
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;
}