You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/12/05 09:50:08 UTC

svn commit: r723661 - /httpd/httpd/trunk/modules/cluster/mod_heartbeat.c

Author: pquerna
Date: Fri Dec  5 00:50:08 2008
New Revision: 723661

URL: http://svn.apache.org/viewvc?rev=723661&view=rev
Log:
Don't overcount busy servers from previous generations.
Suggested by: Ruediger Pluem

Modified:
    httpd/httpd/trunk/modules/cluster/mod_heartbeat.c

Modified: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartbeat.c?rev=723661&r1=723660&r2=723661&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartbeat.c Fri Dec  5 00:50:08 2008
@@ -73,7 +73,8 @@
                 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++;
             }
         }