worker MPM: fix stack overlay bug that could cause the parent

process to crash.

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

diff --git a/CHANGES b/CHANGES
index cb491abcf5a3c7e2f6e8dc685111c97031b5bc35..7b3df99b6f8c83d66ea5085f5ee9c8d947dbc57f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) worker MPM: fix stack overlay bug that could cause the parent
+     process to crash.  [Jeff Trawick]
+
   *) Unix MPMs: Stop dropping connections when the file descriptor
      is at least FD_SETSIZE.  [Jeff Trawick]
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 874125e603d9aa4d12ce2c6f2da816bda9274f43..25ef239a3e1d44313193fb53201571711a06087c 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1441,7 +1441,8 @@ static void perform_idle_server_maintenance(void)
                 ++idle_thread_count;
             }
         }
-        if (any_dead_threads && totally_free_length < idle_spawn_rate 
+        if (any_dead_threads && totally_free_length < idle_spawn_rate
+                && free_length < MAX_SPAWN_RATE
                 && (!ps->pid               /* no process in the slot */
                     || ps->quiescing)) {   /* or at least one is going away */
             if (all_dead_threads) {