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 4a90f6b2c632e920126494494f8fb86d6808dcd3..0d6620efe55a65294f3f1ba15ddcdecff0ba6260 100644 (file)
--- 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 f0dd4cc13465135882375a4ca5fd43c1b8ffe9a8..4aecc42159f94fa1122d9230c45c77d6738c50c8 100644 (file)
--- 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,