From: Jim Jagielski <jim@apache.org>
Date: Tue, 5 May 2009 19:29:04 +0000 (+0000)
Subject: optimize.... rp! :)
X-Git-Tag: 2.3.3~649
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9399483e1689541b15a5213013abae32e1a48acb;p=thirdparty%2Fapache%2Fhttpd.git

optimize.... rp! :)


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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 9fab090f830..06867d3baa3 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1814,7 +1814,7 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)
             return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
     }
     /* Add the worker to the load balancer */
-    ap_proxy_add_worker_to_balancer(cmd->pool, balancer, &worker);
+    ap_proxy_add_worker_to_balancer(cmd->pool, balancer, worker);
     return NULL;
 }
 
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 1c958a5fb5b..866e72007e4 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -606,7 +606,7 @@ PROXY_DECLARE(const char *) ap_proxy_add_balancer(proxy_balancer **balancer,
  */
 PROXY_DECLARE(void) ap_proxy_add_worker_to_balancer(apr_pool_t *pool,
                                                     proxy_balancer *balancer,
-                                                    proxy_worker **worker);
+                                                    proxy_worker *worker);
 /**
  * Get the most suitable worker and(or) balancer for the request
  * @param worker   worker used for processing request
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index ab546d4696c..7f4956f4624 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1471,12 +1471,12 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_create_worker(apr_pool_t *p)
 
 PROXY_DECLARE(void)
 ap_proxy_add_worker_to_balancer(apr_pool_t *pool, proxy_balancer *balancer,
-                                proxy_worker **worker)
+                                proxy_worker *worker)
 {
     proxy_worker **runtime;
 
     runtime = apr_array_push(balancer->workers);
-    memcpy(runtime, worker, sizeof(proxy_worker *));
+    *runtime = worker
     (*runtime)->id = proxy_lb_workers;
     /* Increase the total runtime count */
     proxy_lb_workers++;