From cdf5c0570f48ef95212109be459f5f5de6ee2164 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 3 Jun 2014 15:25:59 +0000 Subject: [PATCH] Now allow MPMs to call ap_log_common() git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1599603 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/event/event.c | 1 + server/mpm/eventopt/eventopt.c | 1 + server/mpm/netware/mpm_netware.c | 1 + server/mpm/prefork/prefork.c | 1 + server/mpm/winnt/mpm_winnt.c | 1 + server/mpm/worker/worker.c | 1 + 6 files changed, 6 insertions(+) diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 779499a40e..4d960e9d5c 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -3041,6 +3041,7 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); + ap_log_common(s); mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c index ed36e2629b..93f34655f7 100644 --- a/server/mpm/eventopt/eventopt.c +++ b/server/mpm/eventopt/eventopt.c @@ -2837,6 +2837,7 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); + ap_log_common(s); mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 6b049c9816..aea64217f5 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -916,6 +916,7 @@ static int netware_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00225) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); + ap_log_common(s); show_server_data(); mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 05a782e69a..b7b3f4e26b 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1027,6 +1027,7 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00164) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); + ap_log_common(s); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00165) "Accept mutex: %s (default: %s)", apr_proc_mutex_name(accept_mutex[0]), diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 43638c0880..746523994b 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1722,6 +1722,7 @@ static int winnt_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s ) ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00456) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); + ap_log_common(s); restart = master_main(ap_server_conf, shutdown_event, restart_event); diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index b90161970d..07dc1f9c5a 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1865,6 +1865,7 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00293) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); + ap_log_common(s); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00294) "Accept mutex: %s (default: %s)", apr_proc_mutex_name(accept_mutex[0]), -- 2.50.1