From: Paul Querna <pquerna@apache.org>
Date: Fri, 5 Dec 2008 08:50:08 +0000 (+0000)
Subject: Don't overcount busy servers from previous generations.
X-Git-Tag: 2.3.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b2f6257e497843e3d42520cb88b0a66895ba543;p=thirdparty%2Fapache%2Fhttpd.git

Don't overcount busy servers from previous generations.
Suggested by: Ruediger Pluem


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

diff --git a/modules/cluster/mod_heartbeat.c b/modules/cluster/mod_heartbeat.c
index 4457a97b62d..0f14e9b644b 100644
--- a/modules/cluster/mod_heartbeat.c
+++ b/modules/cluster/mod_heartbeat.c
@@ -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++;
             }
         }