Commit e0727e42 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Do not overwrite the status of initialized workers and respect the configured 

  status of uninitilized workers when creating a new child process.


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

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_proxy_balancer: Do not overwrite the status of initialized workers and









     respect the configured status of uninitilized workers when creating a new









     child process. [Ruediger Pluem]

















  *) mod_speling: Stop crashing with certain non-file requests.  [Jeff Trawick]

















  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.


































modules/proxy/mod_proxy_balancer.c



+10
−1



























Changes for modules/proxy/mod_proxy_balancer.c: 10 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -84,7 +84,16 @@ static int init_balancer_members(proxy_server_conf *conf, server_rec *s,

















    for (i = 0; i < balancer->workers->nelts; i++) {









        ap_proxy_initialize_worker_share(conf, workers, s);









        workers->s->status = PROXY_WORKER_INITIALIZED;









        if (!(workers->s->status & PROXY_WORKER_INITIALIZED)) {









            workers->s->status |= (workers->status | PROXY_WORKER_INITIALIZED);









            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,









                         "proxy: BALANCER: initialized balancer member %d for "









                         "balancer %s in child %" APR_PID_T_FMT " for (%s) "









                         "min=%d max=%d smax=%d",









                          workers->id, balancer->name, getpid(),









                          workers->hostname, workers->min, workers->hmax,









                          workers->smax);









        }









        ++workers;









    }