fix "long lost child came home!" messages after a graceful restart with

MaxClients (== ap_daemons_limit) lowered.  This leaves junk at the end of
the formerly used part of the scoreboard.  If you then decide to raise
MaxClients via graceful, the junk prevents those scoreboard slots from
being used.

This should not impact performance because find_child_by_pid stops its
search when it sees a matching pid.  If we don't have a match, something
else is busted.

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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index bc92c3929b67275031bc9f3fb92549ae9bfe94fe..92afe6a2c23a21da5aea727b7215504bdae3eaed 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -324,7 +324,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
             *result = ap_max_requests_per_child;
             return APR_SUCCESS;
         case AP_MPMQ_MAX_DAEMONS:
-            *result = ap_daemons_limit;
+            *result = server_limit;
             return APR_SUCCESS;
     }
     return APR_ENOTIMPL;