summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2015-05-16 11:17:29 +0200
committerYann Ylavic <ylavic@apache.org>2015-05-16 11:17:29 +0200
commitf0cbf9730750ccd1c9215dfdecc5541c1f89e92b (patch)
treebe6e4187879c2db02faecc55f82b3be783ac6964 /include
parentFollow up to r1679181: fix warning (return discards qualifiers from pointer t... (diff)
downloadapache2-f0cbf9730750ccd1c9215dfdecc5541c1f89e92b.tar.xz
apache2-f0cbf9730750ccd1c9215dfdecc5541c1f89e92b.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/ap_mmn.h2
-rw-r--r--include/http_log.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 816810968f..2821f97cfc 100644
--- 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 cced5cc67d..e82389bece 100644
--- 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