Hmmm... forgot git commit/dcommit.

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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index cc69ef6557d36c33b1e50159a9c1583d33bce430..8b7077a22449df34a963cb3ea7c03939cebc6d38 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -315,7 +315,7 @@ extern const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy,
 
 AP_DECLARE(apr_status_t) ap_mpm_note_child_killed(int childnum);
 
-AP_DECLARE_HOOK(int,monitor,(apr_pool_t *p, server_rec * s))
+AP_DECLARE_HOOK(int,monitor,(apr_pool_t *p, server_rec *s))
 
 /* register modules that undertake to manage system security */
 AP_DECLARE(int) ap_sys_privileges_handlers(int inc);

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 65fff4e354871e8b8b27059b29dc23dd40bde08c..ca8d8e54d94e2784d30fbdc9039e7506556a6962 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -81,7 +81,7 @@ APR_HOOK_STRUCT(
 )
 #endif
 AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,
-                          (apr_pool_t *p), (p), OK, DECLINED)
+                          (apr_pool_t *p, server_rec *s), (p, s), OK, DECLINED)
 AP_IMPLEMENT_HOOK_RUN_ALL(int, drop_privileges,
                           (apr_pool_t * pchild, server_rec * s),
                           (pchild, s), OK, DECLINED)