Commit 6ba4a0de authored by Paul Querna's avatar Paul Querna
Browse files

Merge r394065 and r394446 from trunk. 

PR: 38227, 38267
Reviewed By:  rpluem, jim, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396050 13f79535-47bb-0310-9956-ffa450edef68
parent c02b79b2

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ Changes with Apache 2.2.2 
  *) mod_deflate: work correctly in an internal redirect

     [Brian J. France <list firehawksystems com>]









  *) mod_proxy_balancer: Initialize members of a balancer correctly.









     PR 38227. [James A. Robinson <jim.robinson stanford.edu>]

















  *) mod_proxy: Do not release connections from connection pool twice.









     PR 38793. [Ruediger Pluem, matthias <mk-asf gigacodes.de>]










































modules/proxy/mod_proxy_balancer.c



+1
−10



























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



Original line number
Diff line number
Diff line







@@ -84,16 +84,7 @@ 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);









        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);









        }









        ap_proxy_initialize_worker(workers, s);









        ++workers;









    }