tweak "requests currently being processed". It is confusing to not have

old generation requests included after a graceful restart.  But we
shouldn't count workers who are starting up.

OTOH, the "ready" counter needs to pay attention to the generation, so it
stays in sync with how p_i_s_m counts idle workers.

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

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 7c258e79659ac5d2cf7de461a58d49e193d87397..ceb923718be0aa6f5d7ca12d6929e6f8a84625f4 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -347,11 +347,13 @@ static int status_handler(request_rec *r)
             stat_buffer[indx] = status_flags[res];
 
             if (!ps_record->quiescing
-                && ps_record->generation == ap_my_generation
                 && ps_record->pid) {
-                if (res == SERVER_READY)
+                if (res == SERVER_READY
+                    && ps_record->generation == ap_my_generation)
                     ready++;
-                else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)
+                else if (res != SERVER_DEAD &&
+                         res != SERVER_STARTING &&
+                         res != SERVER_IDLE_KILL)
                     busy++;
             }