diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2016-04-09 13:46:36 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2016-04-09 13:46:36 +0200 |
| commit | 48eddd3d39fa2668ee29198ebfb33c41d4738c21 (patch) | |
| tree | 247d4f813b86ea354d18d337b09bb137caab8e15 /server/mpm/winnt | |
| parent | d5325781b38052fbdf4cc28a6c6d3052b9424b51 (diff) | |
| download | apache2-48eddd3d39fa2668ee29198ebfb33c41d4738c21.tar.gz | |
Imported Upstream version 2.4.20
Diffstat (limited to 'server/mpm/winnt')
| -rw-r--r-- | server/mpm/winnt/mpm_winnt.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 853c38b8..e0f07849 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, - " %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, - " %d threads, decreasing to %d.", - thread_limit, thread_limit); - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, - " 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 " @@ -1660,7 +1654,7 @@ static int winnt_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, s if (ap_setup_listeners(s) < 1) { ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_STARTUP, 0, NULL, APLOGNO(00451) "no listening sockets available, shutting down"); - return DONE; + return !OK; } return OK; @@ -1713,7 +1707,7 @@ static int winnt_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s ) if (!restart && ((parent_pid == my_pid) || one_process)) { /* Set up the scoreboard. */ if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) { - return DONE; + return !OK; } } |