]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Don't overcount busy servers from previous generations.
authorPaul Querna <pquerna@apache.org>
Fri, 5 Dec 2008 08:50:08 +0000 (08:50 +0000)
committerPaul Querna <pquerna@apache.org>
Fri, 5 Dec 2008 08:50:08 +0000 (08:50 +0000)
Suggested by: Ruediger Pluem

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

modules/cluster/mod_heartbeat.c

index 4457a97b62d4b6e81ed40c29e8e8cb8f7b6a5c37..0f14e9b644b706529ebb2c58460ff8900376b65e 100644 (file)
@@ -73,7 +73,8 @@ static int hb_monitor(hb_ctx_t *ctx, apr_pool_t *p)
                 ready++;
             }
             else if (res != SERVER_DEAD &&
-                     res != SERVER_STARTING && res != SERVER_IDLE_KILL) {
+                     res != SERVER_STARTING && res != SERVER_IDLE_KILL &&
+                     ps->generation == ap_my_generation) {
                 busy++;
             }
         }