]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Don't reset the balancer when we create a new child
authorJean-Frederic Clere <jfclere@apache.org>
Mon, 26 Feb 2024 08:41:28 +0000 (08:41 +0000)
committerJean-Frederic Clere <jfclere@apache.org>
Mon, 26 Feb 2024 08:41:28 +0000 (08:41 +0000)
and don't change shared memory the load balancer is not using.

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

modules/proxy/balancers/mod_lbmethod_bytraffic.c
modules/proxy/proxy_util.c

index 6cfab94c0573626fe39d0c12cbf7a4ed57a68eeb..724b028260d7395abd7e4f5218d542a5f6d9013b 100644 (file)
@@ -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;
     }
index 155d82be36f21a11703cf1467e06ee6c18188e51..38ba647791d122153f1d031906eeead99528ac05 100644 (file)
@@ -1362,8 +1362,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) {