From: Jeff Trawick <trawick@apache.org>
Date: Mon, 12 Nov 2001 17:59:28 +0000 (+0000)
Subject: threaded: Fix the resetting of MaxClients when it isn't a multiple
X-Git-Tag: 2.0.29~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eaf0b36f6b8d99ae9d7294753e75fbaf0631f1ae;p=thirdparty%2Fapache%2Fhttpd.git

threaded: Fix the resetting of MaxClients when it isn't a multiple
of the number of threads per process.


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

diff --git a/CHANGES b/CHANGES
index 4a90f6b2c63..0d6620efe55 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,9 @@
 Changes with Apache 2.0.29-dev
 
-  *) Really reset the MaxClients value in worker when the
-     configured value is not a multiple of the number of threads
-     per child.  We said we did previously but we forgot to.
-     [Jeff Trawick]
+  *) Really reset the MaxClients value in worker and threaded
+     when the configured value is not a multiple of the number 
+     of threads per child.  We said we did previously but we 
+     forgot to. [Jeff Trawick]
 
   *) Add Debian layout.  [Daniel Stone <daniel@sfarc.net>]
 
diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index f0dd4cc1346..4aecc42159f 100644
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -1523,6 +1523,7 @@ static const char *set_server_limit (cmd_parms *cmd, void *dummy,
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
                     " for a maximum of %d child processes,",
                     ap_daemons_limit);
+       max_clients = ap_daemons_limit * ap_threads_per_child;
     }
     if (ap_daemons_limit > HARD_SERVER_LIMIT) {
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,