svn commit: r1387691 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c

[ji...@apache.org]

Author: jim
Date: Wed Sep 19 17:42:38 2012
New Revision: 1387691

URL: http://svn.apache.org/viewvc?rev=1387691&view=rev
Log:
Oops... didn't mean to commit that.


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=1387691&r1=1387690&r2=1387691&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Wed Sep 19 17:42:38 2012
@@ -1173,13 +1173,13 @@ static void * merge_proxy_config(apr_poo
     proxy_server_conf *base = (proxy_server_conf *) basev;
     proxy_server_conf *overrides = (proxy_server_conf *) overridesv;
 
-    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);
+    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;
     ps->forward = overrides->forward ? overrides->forward : base->forward;
     ps->reverse = overrides->reverse ? overrides->reverse : base->reverse;