Merge r374929 from trunk:

* Do not overwrite the status of initialized workers and respect the configured
  status of uninitilized workers when creating a new child process.

Submitted by: rpluem
Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index 04dcbd649a066ed8e219b5673f2a7814a7e328d4..24e0f18741cd3ea78720ba004186b8a79dd8ca0b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) 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_proxy_ajp: Crosscheck the length of the body chunk with the length of
      the ajp message to prevent mod_proxy_ajp from reading beyond the buffer
      boundaries and thus revealing possibly sensitive memory contents to the

diff --git a/STATUS b/STATUS
index 18b2e55581ef2c45e6678d0ab74f4b21553ca4c8..8b4c4d0ad52543cd8d0d3863ee1e9a00d32f33c0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -134,15 +134,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       http://people.apache.org/~rpluem/patches/partial_2.2.diff
       +1: jim, rpluem, jerenkrantz
 
-    * 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.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs?rev=374929&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jim, pquerna
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index def1919254def86a9f578025ec9fbff1fdfce9df..c05635a2340ebe6f5ffd7a4be2693b9b45ac3951 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -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;
     }