Don't reset the balancer when we create a new child

and don't change shared memory the load balancer is not using.

Merges r1916004 from trunk
Submitted by: jfclere
Reviewed by: jfclere, rpluem, gbechis

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1919145 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/balancers/mod_lbmethod_bytraffic.c b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
index 6cfab94c0573626fe39d0c12cbf7a4ed57a68eeb..724b028260d7395abd7e4f5218d542a5f6d9013b 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c
+++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
@@ -73,8 +73,6 @@ static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
     proxy_worker **worker;
     worker = (proxy_worker **)balancer->workers->elts;
     for (i = 0; i < balancer->workers->nelts; i++, worker++) {
-        (*worker)->s->lbstatus = 0;
-        (*worker)->s->busy = 0;
         (*worker)->s->transferred = 0;
         (*worker)->s->read = 0;
     }

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 7eb097820cef57fa522e15205749640bb8c8f3cd..7c0d3150c3c2a54acdbd613283316dce29b0789f 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1358,8 +1358,6 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_balancer(proxy_balancer *balance
         ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, APLOGNO(00921) "slotmem_attach failed");
         return APR_EGENERAL;
     }
-    if (balancer->lbmethod && balancer->lbmethod->reset)
-        balancer->lbmethod->reset(balancer, s);
 
 #if APR_HAS_THREADS
     if (balancer->tmutex == NULL) {