Fix brokenness when ThreadsPerChild is higher than the built-in

limit.  We left ap_threads_per_child at the higher value which
led to segfaults when doing certain scoreboard operations.

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

diff --git a/CHANGES b/CHANGES
index 1920d23e78ff22617a5c0cd3e2029998653634f2..749748df835a29dcbb4d0a92ba80aa0bc3657ae0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 Changes with Apache 2.0.19-dev
+
+  *) Fix brokenness when ThreadsPerChild is higher than the built-in
+     limit.  We left ap_threads_per_child at the higher value which
+     led to segfaults when doing certain scoreboard operations.
+     [Jeff Trawick]
+
   *) Fix seg faults and/or missing output from mod_include.  The
      default_handler was using the subrequest pool for files and
      MMAPs, even though the associated APR structures typically 

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 30ca06463d67a75aaeb01e4e231cf5a6a1c6b239..34d382cad766d31709624479da6607afb5660433 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -1387,7 +1387,7 @@ static const char *set_threads_per_child (cmd_parms *cmd, void *dummy,
     ap_threads_per_child = atoi(arg);
     if (ap_threads_per_child > HARD_THREAD_LIMIT) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                     "WARNING: ThreadsPerChild of %d exceeds compile time"
+                     "WARNING: ThreadsPerChild of %d exceeds compile time "
                      "limit of %d threads,", ap_threads_per_child,
                      HARD_THREAD_LIMIT);
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
@@ -1396,6 +1396,7 @@ static const char *set_threads_per_child (cmd_parms *cmd, void *dummy,
         ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                      " HARD_THREAD_LIMIT define in %s.",
                      AP_MPM_HARD_LIMITS_FILE);
+        ap_threads_per_child = HARD_THREAD_LIMIT;
     }
     else if (ap_threads_per_child < 1) {
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,