From 71ee1ba766295c40539834dbda3f140324d80f08 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 5 Sep 2003 21:26:57 +0000 Subject: [PATCH] merge this from 2.1-dev: Fix a misleading message from the some of the threaded MPMs when MaxClients has to be lowered due to the setting of ServerLimit. Reviewed by: stoddard, brianp git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101170 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ server/mpm/experimental/leader/leader.c | 2 +- server/mpm/experimental/threadpool/threadpool.c | 2 +- server/mpm/worker/worker.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 6d6cdeea6dc..54997df30fa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Changes with Apache 2.0.48 + *) Fix a misleading message from the some of the threaded MPMs when + MaxClients has to be lowered due to the setting of ServerLimit. + [Jeff Trawick] + *) Lower the severity of the "listener thread didn't exit" message to debug, as it is of interest only to developers. PR 9011 [Jeff Trawick] diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c index 035b5d49864..cb022943d71 100644 --- a/server/mpm/experimental/leader/leader.c +++ b/server/mpm/experimental/leader/leader.c @@ -1915,7 +1915,7 @@ static const char *set_max_clients (cmd_parms *cmd, void *dummy, server_limit); ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " Automatically lowering MaxClients to %d. To increase,", - server_limit); + server_limit * ap_threads_per_child); ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " please see the ServerLimit directive."); ap_daemons_limit = server_limit; diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c index 3fbdd19f6c8..a2d670eed96 100644 --- a/server/mpm/experimental/threadpool/threadpool.c +++ b/server/mpm/experimental/threadpool/threadpool.c @@ -2169,7 +2169,7 @@ static const char *set_max_clients (cmd_parms *cmd, void *dummy, server_limit); ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " Automatically lowering MaxClients to %d. To increase,", - server_limit); + server_limit * ap_threads_per_child); ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " please see the ServerLimit directive."); ap_daemons_limit = server_limit; diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index efc1d8acfaf..df6c7e6bbca 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -2031,7 +2031,7 @@ static const char *set_max_clients (cmd_parms *cmd, void *dummy, server_limit); ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " Automatically lowering MaxClients to %d. To increase,", - server_limit); + server_limit * ap_threads_per_child); ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " please see the ServerLimit directive."); ap_daemons_limit = server_limit; -- 2.47.2