core: Follow up to r1599601: s/ap_log_common/ap_log_mpm_common/.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1679714 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 816810968f0eab43104b1d18af63fa29bc23ee85..2821f97cfca9b0372db9171268dcc30bb2b86cf0 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -452,7 +452,7 @@
  * 20140207.4 (2.5.0-dev)  add ap_mpm_register_socket_callback_timeout
  * 20140207.5 (2.5.0-dev)  Add ap_mpm_resume_suspended(), AP_MPMQ_CAN_SUSPEND to
  *                         ap_mpm_query(), and suspended_baton to conn_rec
- * 20140207.6 (2.5.0-dev)  Added ap_log_common().
+ * 20140207.6 (2.5.0-dev)  Added ap_log_mpm_common().
  * 20140207.7 (2.5.0-dev)  Added ap_force_set_tz().
  * 20140207.8 (2.5.0-dev)  Added ap_shutdown_conn().
  * 20140611.0 (2.5.0-dev)  Add ap_mpm_socket_callback_fn_t.

diff --git a/include/http_log.h b/include/http_log.h
index cced5cc67d2612699964936fdc0f09e4e9fe8260..e82389becec5537a4887d6893d7eade9c4dfefe5 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -741,11 +741,11 @@ AP_DECLARE(void) ap_error_log2stderr(server_rec *s);
 AP_DECLARE(void) ap_log_command_line(apr_pool_t *p, server_rec *s);
 
 /**
- * Log common shared data
- * @param s The server_rec whose process's command line we want to log.
+ * Log common (various) MPM shared data at startup.
+ * @param s The server_rec of the error log we want to log to.
  * Misc commonly logged data is logged to that server's error log.
  */
-AP_DECLARE(void) ap_log_common(server_rec *s);
+AP_DECLARE(void) ap_log_mpm_common(server_rec *s);
 
 /**
  * Log the current pid of the parent process

diff --git a/server/listen.c b/server/listen.c
index ddf772e7fde7398aeee05a8a65a7520797336d0a..9de52bc9f359cc61f1f63e3542b74064e678373e 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -45,7 +45,7 @@
 AP_DECLARE_DATA ap_listen_rec *ap_listeners = NULL;
 
 /* Let ap_num_listen_buckets be global so that it can
- * be printed by ap_log_common(), but keep the listeners
+ * be printed by ap_log_mpm_common(), but keep the listeners
  * buckets static since it is used only here to close them
  * all (including duplicated) with ap_close_listeners().
  */

diff --git a/server/log.c b/server/log.c
index 25f4157a910438836316f3918d2fb0ba9c1a2647..461b84c8b0a4d2b8ceefa2c2806614aa5547d73b 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -1489,7 +1489,7 @@ AP_DECLARE(void) ap_log_command_line(apr_pool_t *plog, server_rec *s)
 }
 
 /* grab bag function to log commonly logged and shared info */
-AP_DECLARE(void) ap_log_common(server_rec *s)
+AP_DECLARE(void) ap_log_mpm_common(server_rec *s)
 {
     ap_log_error(APLOG_MARK, APLOG_DEBUG , 0, s, APLOGNO(02639)
                  "Using SO_REUSEPORT: %s (%d)",

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 3406fdf71f3d0882630c79779d26e57662a5eed4..63028befb2d466b71c2ecf00d93a53c6f5fd5113 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -3130,7 +3130,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);
+    ap_log_mpm_common(s);
 
     mpm_state = AP_MPMQ_RUNNING;
 

diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c
index 96782fd286e5831a2ec737cb61b03695108976e5..897324655f3d1c5c753115c0e2f335a79d9caa41 100644 (file)
--- a/server/mpm/motorz/motorz.c
+++ b/server/mpm/motorz/motorz.c
@@ -1250,7 +1250,7 @@ static int motorz_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(02875)
                 "Server built: %s", ap_get_server_built());
     ap_log_command_line(plog, s);
-    ap_log_common(s);
+    ap_log_mpm_common(s);
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02876)
                 "Accept mutex: %s (default: %s)",
                 (all_buckets[0].mutex)

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 5ff7107a3ae297e25a4a028fe75bd39e35a814f1..8999063a1a832ee4a2efcc241a08943d8a23022a 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -916,7 +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);
+    ap_log_mpm_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 507a5a2295aceb6da9f2fe44800f29af52e33dc1..78638c80032d8efaec44f7846ab4a00e301cc490 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1035,7 +1035,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_mpm_common(s);
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00165)
                 "Accept mutex: %s (default: %s)",
                 (all_buckets[0].mutex)

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index c9b5317689d3dabfdb4abadd948182663f422d2f..2e7295b0e58637c571ad0dd7d1e8842adf9466af 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1722,7 +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);
+        ap_log_mpm_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 695024fc61df4e1bdbb5f547e89cb1d1956ec973..99399a0981b02f4f300819457cf411ca5ca10945 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1867,7 +1867,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_mpm_common(s);
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00294)
                 "Accept mutex: %s (default: %s)",
                 (all_buckets[0].mutex)