From: David Reid <dreid@apache.org>
Date: Thu, 22 Jun 2000 01:36:33 +0000 (+0000)
Subject: Cut free mpm_common.c from ap_max_daemons_limit as a variable.  Now we
X-Git-Tag: APACHE_2_0_ALPHA_5~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7231c3a12ac9fb9248bb9444c812638949114223;p=apache

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 0a7aee56b0..cb73a5c9a2 100644
--- 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;