From: Jim Jagielski <jim@apache.org>
Date: Wed, 19 Sep 2012 17:42:38 +0000 (+0000)
Subject: Oops... didn't mean to commit that.
X-Git-Tag: 2.5.0-alpha~6300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5f36c3f888de46212ba3f4e5b048b1282d61fc2;p=apache

Oops... didn't mean to commit that.



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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index bcef3d89c0..cd71a9218a 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -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 *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;