www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

wtf are we doing merging in these from the parent??

Browse Source 
These are server specific!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387603 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2012-09-19 14:17:03 +00:00
parent ebe03ff096
commit 2619a5308f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/proxy/mod_proxy.c
View File

@@ -1173,13 +1173,13 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv)
proxy_server_conf *base = (proxy_server_conf *) basev; proxy_server_conf *base = (proxy_server_conf *) basev;
proxy_server_conf *overrides = (proxy_server_conf *) overridesv; proxy_server_conf *overrides = (proxy_server_conf *) overridesv;
ps->proxies = apr_array_append(p, base->proxies, overrides->proxies); ps->proxies = overrides->proxies;
ps->sec_proxy = apr_array_append(p, base->sec_proxy, overrides->sec_proxy); ps->sec_proxy = overrides->sec_proxy;
ps->aliases = apr_array_append(p, base->aliases, overrides->aliases); ps->aliases = overrides->aliases;
ps->noproxies = apr_array_append(p, base->noproxies, overrides->noproxies); ps->noproxies = overrides->noproxies;
ps->dirconn = apr_array_append(p, base->dirconn, overrides->dirconn); ps->dirconn = overrides->dirconn;
ps->workers = apr_array_append(p, base->workers, overrides->workers); ps->workers = overrides->workers;
ps->balancers = apr_array_append(p, base->balancers, overrides->balancers); ps->balancers = overrides->balancers;
ps->forward = overrides->forward ? overrides->forward : base->forward; ps->forward = overrides->forward ? overrides->forward : base->forward;
ps->reverse = overrides->reverse ? overrides->reverse : base->reverse; ps->reverse = overrides->reverse ? overrides->reverse : base->reverse;