Cut free mpm_common.c from ap_max_daemons_limit as a variable. Now we

get the value from the MPM and thus free the MPM to use any variable
name they like.

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

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 0a7aee56b0a0e6f408325c4ed4b3463ae84da6fd..cb73a5c9a27fa09bae61e9cf3d4dea61f13fa9a7 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -81,7 +81,7 @@
 #include <sys/socket.h>
 #endif
 
-#if defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(MPM_BEOS)
+#if defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
 #define CHILD_TABLE 1
 #define CHILD_INFO_TABLE     ap_child_table
 #elif defined(MPMT_PTHREAD_MPM) || defined (PREFORK_MPM)
@@ -99,6 +99,7 @@ void ap_reclaim_child_processes(int terminate)
     ap_status_t waitret;
     int tries;
     int not_dead_yet;
+    int max_daemons = ap_get_max_daemons();
 
 #ifdef SCOREBOARD
     ap_sync_scoreboard_image();
@@ -116,7 +117,7 @@ void ap_reclaim_child_processes(int terminate)
 
         /* now see who is done */
         not_dead_yet = 0;
-        for (i = 0; i < ap_max_daemons_limit; ++i) {
+        for (i = 0; i < max_daemons; ++i) {
             pid_t pid = CHILD_INFO_TABLE[i].pid;
             ap_proc_t proc;