From: Jeff Trawick <trawick@apache.org>
Date: Mon, 12 Nov 2001 17:50:59 +0000 (+0000)
Subject: Really reset the MaxClients value in worker when the
X-Git-Tag: 2.0.29~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd6569995c537adb5e4656cc39d77f58c28f2a1b;p=thirdparty%2Fapache%2Fhttpd.git

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.


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

diff --git a/CHANGES b/CHANGES
index f990652bcda..4a90f6b2c63 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 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]
+
   *) Add Debian layout.  [Daniel Stone <daniel@sfarc.net>]
 
   *) If shared modules are requested and mod_so is not available,
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 0ea7ae6d8fd..97fbb34653c 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1588,6 +1588,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,