svn commit: r374929 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy_balancer.c

[rp...@apache.org]

Author: rpluem
Date: Sat Feb  4 13:25:48 2006
New Revision: 374929

URL: http://svn.apache.org/viewcvs?rev=374929&view=rev
Log:
* Do not overwrite the status of initialized workers and respect the configured
  status of uninitilized workers when creating a new child process.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=374929&r1=374928&r2=374929&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Feb  4 13:25:48 2006
@@ -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.

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=374929&r1=374928&r2=374929&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Sat Feb  4 13:25:48 2006
@@ -84,7 +84,16 @@
 
     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;
     }