svn commit: r396050 - in /httpd/httpd/branches/2.2.x: CHANGES modules/proxy/mod_proxy_balancer.c

[pq...@apache.org]

Author: pquerna
Date: Fri Apr 21 18:35:50 2006
New Revision: 396050

URL: http://svn.apache.org/viewcvs?rev=396050&view=rev
Log:
Merge r394065 and r394446 from trunk.
PR: 38227, 38267
Reviewed By:  rpluem, jim, wrowe

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=396050&r1=396049&r2=396050&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Apr 21 18:35:50 2006
@@ -4,6 +4,9 @@
   *) 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>]
 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?rev=396050&r1=396049&r2=396050&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Fri Apr 21 18:35:50 2006
@@ -84,16 +84,7 @@
 
     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;
     }