diff options
| -rw-r--r-- | CHANGES | 8 | ||||
| -rw-r--r-- | server/mpm/threaded/threaded.c | 1 |
2 files changed, 5 insertions, 4 deletions
@@ -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 f0dd4cc134..4aecc42159 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, |