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

diff --git a/CHANGES b/CHANGES
index 6d6cdeea6dc2db9aedfc65e912da06196af01a77..54997df30fa57066b9c1ed91669b9528304cfc13 100644 (file)
--- 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 035b5d4986452bdc791d47d3be21fa5a6dd9795e..cb022943d71023f79269ec4c90b253fbdc1017f4 100644 (file)
--- 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 3fbdd19f6c87d88806ba28458770a9b79c0ddf69..a2d670eed9603daef25b1ce0390b94d93cdc9952 100644 (file)
--- 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 efc1d8acfaf9ad49307e42b1646d4a4c5e19b1ee..df6c7e6bbca71ce26092060860e914c6020e9ffb 100644 (file)
--- 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;