From: Yann Ylavic Date: Fri, 1 Apr 2016 12:26:05 +0000 (+0000) Subject: Merge r1731929, r1736681 from trunk: X-Git-Tag: 2.4.20~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f7dbedcae290890c03d9c0aa91b16a217859225;p=thirdparty%2Fapache%2Fhttpd.git Merge r1731929, r1736681 from trunk: Join multi-line MPM startup log messages into single long lines. Followup to r1725394 and r1725548. Fix missing space in log message Submitted by: rjung, jailletc36 Reviewed by: jailletc36, ylavic, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737361 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 05b1fd9b6fd..3728063c90b 100644 --- a/STATUS +++ b/STATUS @@ -113,13 +113,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) Synch 2.4.x with trunk - merge some multi-line log messages in MPMs (+ one style - adjustment in mpm_netware.c, merged accidendly) - Trunk patch: http://svn.apache.org/r1731929 - http://svn.apache.org/r1736681 - 2.4.x patch: http://home.apache.org/~jailletc36/1731929.diff - +1: jailletc36, ylavic, wrowe - *) mod_proxy_express: Fix possible use of DB handle after close. PR 59230. trunk patch: http://svn.apache.org/r1737014 2.4.x patch: trunk works (modulo CHANGES) diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 631914eba39..2418471fd05 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -3296,10 +3296,8 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00497) "WARNING: ServerLimit of %d exceeds compile-time " - "limit of", server_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03105) - " %d servers, decreasing to %d.", - MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); + "limit of %d servers, decreasing to %d.", + server_limit, MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00498) "ServerLimit of %d exceeds compile-time limit " @@ -3340,10 +3338,8 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00502) "WARNING: ThreadLimit of %d exceeds compile-time " - "limit of", thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03106) - " %d threads, decreasing to %d.", - MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); + "limit of %d threads, decreasing to %d.", + thread_limit, MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00503) "ThreadLimit of %d exceeds compile-time limit " @@ -3384,13 +3380,9 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00507) "WARNING: ThreadsPerChild of %d exceeds ThreadLimit " - "of", threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03107) - " %d threads, decreasing to %d.", - thread_limit, thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03108) - " To increase, please see the ThreadLimit " - "directive."); + "of %d threads, decreasing to %d. " + "To increase, please see the ThreadLimit directive.", + threads_per_child, thread_limit, thread_limit); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00508) "ThreadsPerChild of %d exceeds ThreadLimit " @@ -3416,13 +3408,10 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00511) "WARNING: MaxRequestWorkers of %d is less than " - "ThreadsPerChild of", max_workers); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03109) - " %d, increasing to %d. MaxRequestWorkers must be at " - "least as large", - threads_per_child, threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03110) - " as the number of threads in a single server."); + "ThreadsPerChild of %d, increasing to %d. " + "MaxRequestWorkers must be at least as large " + "as the number of threads in a single server.", + max_workers, threads_per_child, threads_per_child); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00512) "MaxRequestWorkers of %d is less than ThreadsPerChild " @@ -3440,13 +3429,9 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00513) "WARNING: MaxRequestWorkers of %d is not an integer " - "multiple of", max_workers); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03111) - " ThreadsPerChild of %d, decreasing to nearest " - "multiple %d,", threads_per_child, - tmp_max_workers); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03112) - " for a maximum of %d servers.", + "multiple of ThreadsPerChild of %d, decreasing to nearest " + "multiple %d, for a maximum of %d servers.", + max_workers, threads_per_child, tmp_max_workers, ap_daemons_limit); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00514) @@ -3461,14 +3446,11 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (ap_daemons_limit > server_limit) { if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00515) - "WARNING: MaxRequestWorkers of %d would require %d " - "servers and ", max_workers, ap_daemons_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03113) - " would exceed ServerLimit of %d, decreasing to %d.", - server_limit, server_limit * threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03114) - " To increase, please see the ServerLimit " - "directive."); + "WARNING: MaxRequestWorkers of %d would require %d servers " + "and would exceed ServerLimit of %d, decreasing to %d. " + "To increase, please see the ServerLimit directive.", + max_workers, ap_daemons_limit, server_limit, + server_limit * threads_per_child); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00516) "MaxRequestWorkers of %d would require %d servers and " @@ -3497,11 +3479,9 @@ static int event_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00519) "WARNING: MinSpareThreads of %d not allowed, " - "increasing to 1", min_spare_threads); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03115) - " to avoid almost certain server failure."); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03116) - " Please read the documentation."); + "increasing to 1 to avoid almost certain server " + "failure. Please read the documentation.", + min_spare_threads); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00520) "MinSpareThreads of %d not allowed, increasing to 1", diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index ccce767faba..22bf5e73710 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -508,11 +508,8 @@ static int mpmt_os2_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00215) "WARNING: MinSpareThreads of %d not allowed, " - "increasing to 1", ap_min_spare_threads); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03123) - " to avoid almost certain server failure."); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03124) - " Please read the documentation."); + "increasing to 1 to avoid almost certain server failure. " + "Please read the documentation.", ap_min_spare_threads); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00216) "MinSpareThreads of %d not allowed, increasing to 1", diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 42d2a54196c..2fab52f5989 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -812,7 +812,7 @@ static void show_server_data() do { printf(" %d", lr->bind_addr->port); lr = lr->next; - } while(lr && lr != ap_listeners); + } while (lr && lr != ap_listeners); /* Display dynamic modules loaded */ printf("\n"); @@ -1021,15 +1021,11 @@ static int netware_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00228) "WARNING: MaxThreads of %d exceeds compile-time " - "limit of", ap_threads_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03125) - " %d threads, decreasing to %d.", - HARD_THREAD_LIMIT, HARD_THREAD_LIMIT); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03126) - " To increase, please see the HARD_THREAD_LIMIT" - "define in"); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03127) - " server/mpm/netware%s.", MPM_HARD_LIMITS_FILE); + "limit of %d threads, decreasing to %d. " + "To increase, please see the HARD_THREAD_LIMIT " + "define in server/mpm/netware%s.", + ap_threads_limit, HARD_THREAD_LIMIT, HARD_THREAD_LIMIT, + MPM_HARD_LIMITS_FILE); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00229) "MaxThreads of %d exceeds compile-time limit " @@ -1071,11 +1067,8 @@ static int netware_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00233) "WARNING: MinSpareThreads of %d not allowed, " - "increasing to 1", ap_threads_min_free); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03128) - " to avoid almost certain server failure."); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03129) - " Please read the documentation."); + "increasing to 1 to avoid almost certain server failure. " + "Please read the documentation.", ap_threads_min_free); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00234) "MinSpareThreads of %d not allowed, increasing to 1", diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 68709dbb5db..273126ad810 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1410,10 +1410,8 @@ static int prefork_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00175) "WARNING: ServerLimit of %d exceeds compile-time " - "limit of", server_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03130) - " %d servers, decreasing to %d.", - MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); + "limit of %d servers, decreasing to %d.", + server_limit, MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00176) "ServerLimit of %d exceeds compile-time limit " @@ -1454,13 +1452,9 @@ static int prefork_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00180) "WARNING: MaxRequestWorkers of %d exceeds ServerLimit " - "value of", ap_daemons_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03131) - " %d servers, decreasing MaxRequestWorkers to %d.", - server_limit, server_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, - " To increase, please see the ServerLimit " - "directive."); + "value of %d servers, decreasing MaxRequestWorkers to %d. " + "To increase, please see the ServerLimit directive.", + ap_daemons_limit, server_limit, server_limit); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00181) "MaxRequestWorkers of %d exceeds ServerLimit value " @@ -1500,11 +1494,8 @@ static int prefork_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00186) "WARNING: MinSpareServers of %d not allowed, " - "increasing to 1", ap_daemons_min_free); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03132) - " to avoid almost certain server failure."); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03133) - " Please read the documentation."); + "increasing to 1 to avoid almost certain server failure. " + "Please read the documentation.", ap_daemons_min_free); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00187) "MinSpareServers of %d not allowed, increasing to 1", diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index cf11e0cc212..e0f07849ff9 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1435,10 +1435,8 @@ static int winnt_check_config(apr_pool_t *pconf, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00439) "WARNING: ThreadLimit of %d exceeds compile-time " - "limit of", thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03134) - " %d threads, decreasing to %d.", - MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); + "limit of %d threads, decreasing to %d.", + thread_limit, MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); } else if (is_parent) { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00440) "ThreadLimit of %d exceeds compile-time limit " @@ -1481,13 +1479,9 @@ static int winnt_check_config(apr_pool_t *pconf, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00444) "WARNING: ThreadsPerChild of %d exceeds ThreadLimit " - "of", ap_threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03135) - " %d threads, decreasing to %d.", - thread_limit, thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03136) - " To increase, please see the ThreadLimit " - "directive."); + "of %d threads, decreasing to %d. To increase, please " + "see the ThreadLimit directive.", + ap_threads_per_child, thread_limit, thread_limit); } else if (is_parent) { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00445) "ThreadsPerChild of %d exceeds ThreadLimit " diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index be3895064b6..24aa46bd20d 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -2178,10 +2178,8 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00300) "WARNING: ServerLimit of %d exceeds compile-time " - "limit of", server_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03143) - " %d servers, decreasing to %d.", - MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); + "limit of %d servers, decreasing to %d.", + server_limit, MAX_SERVER_LIMIT, MAX_SERVER_LIMIT); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00301) "ServerLimit of %d exceeds compile-time limit " @@ -2222,10 +2220,8 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00305) "WARNING: ThreadLimit of %d exceeds compile-time " - "limit of", thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03144) - " %d threads, decreasing to %d.", - MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); + "limit of %d threads, decreasing to %d.", + thread_limit, MAX_THREAD_LIMIT, MAX_THREAD_LIMIT); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00306) "ThreadLimit of %d exceeds compile-time limit " @@ -2266,13 +2262,9 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00310) "WARNING: ThreadsPerChild of %d exceeds ThreadLimit " - "of", threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03145) - " %d threads, decreasing to %d.", - thread_limit, thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03146) - " To increase, please see the ThreadLimit " - "directive."); + "of %d threads, decreasing to %d. " + "To increase, please see the ThreadLimit directive.", + threads_per_child, thread_limit, thread_limit); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00311) "ThreadsPerChild of %d exceeds ThreadLimit " @@ -2298,13 +2290,10 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00314) "WARNING: MaxRequestWorkers of %d is less than " - "ThreadsPerChild of", max_workers); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03147) - " %d, increasing to %d. MaxRequestWorkers must be at " - "least as large", - threads_per_child, threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03148) - " as the number of threads in a single server."); + "ThreadsPerChild of %d, increasing to %d. " + "MaxRequestWorkers must be at least as large " + "as the number of threads in a single server.", + max_workers, threads_per_child, threads_per_child); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00315) "MaxRequestWorkers of %d is less than ThreadsPerChild " @@ -2322,13 +2311,9 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00316) "WARNING: MaxRequestWorkers of %d is not an integer " - "multiple of", max_workers); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03149) - " ThreadsPerChild of %d, decreasing to nearest " - "multiple %d,", threads_per_child, - tmp_max_workers); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03150) - " for a maximum of %d servers.", + "multiple of ThreadsPerChild of %d, decreasing to nearest " + "multiple %d, for a maximum of %d servers.", + max_workers, threads_per_child, tmp_max_workers, ap_daemons_limit); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00317) @@ -2344,13 +2329,10 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00318) "WARNING: MaxRequestWorkers of %d would require %d " - "servers and ", max_workers, ap_daemons_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03151) - " would exceed ServerLimit of %d, decreasing to %d.", - server_limit, server_limit * threads_per_child); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, - " To increase, please see the ServerLimit " - "directive."); + "servers and would exceed ServerLimit of %d, decreasing to %d. " + "To increase, please see the ServerLimit directive.", + max_workers, ap_daemons_limit, server_limit, + server_limit * threads_per_child); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00319) "MaxRequestWorkers of %d would require %d servers and " @@ -2379,11 +2361,8 @@ static int worker_check_config(apr_pool_t *p, apr_pool_t *plog, if (startup) { ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00322) "WARNING: MinSpareThreads of %d not allowed, " - "increasing to 1", min_spare_threads); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03152) - " to avoid almost certain server failure."); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(03153) - " Please read the documentation."); + "increasing to 1 to avoid almost certain server failure. " + "Please read the documentation.", min_spare_threads); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(00323) "MinSpareThreads of %d not allowed, increasing to 1",