summaryrefslogtreecommitdiffstats
path: root/server/mpm_common.c
diff options
context:
space:
mode:
authorNick Kew <niq@apache.org>2008-11-03 01:46:54 +0100
committerNick Kew <niq@apache.org>2008-11-03 01:46:54 +0100
commit72119d92f52e65b666337762daef3023ad4ebee0 (patch)
treecafcef8f50eb666e20afd443636b190ac68f6783 /server/mpm_common.c
parent* r708902 fixes PR39774 and thus is worth a CHANGES entry. (diff)
downloadapache2-72119d92f52e65b666337762daef3023ad4ebee0.tar.xz
apache2-72119d92f52e65b666337762daef3023ad4ebee0.zip
Switch all unix MPMs to use drop_privileges hook (mod_unixd) for startup
and add a flag to prevent running without any module taking responsibility for managing system privileges! git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709993 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm_common.c')
-rw-r--r--server/mpm_common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 3c04350496..1b292814f4 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -64,16 +64,21 @@
APR_HOOK_STRUCT(
APR_HOOK_LINK(fatal_exception)
APR_HOOK_LINK(monitor)
+ APR_HOOK_LINK(drop_privileges)
)
AP_IMPLEMENT_HOOK_RUN_ALL(int, fatal_exception,
(ap_exception_info_t *ei), (ei), OK, DECLINED)
#else
APR_HOOK_STRUCT(
APR_HOOK_LINK(monitor)
+ APR_HOOK_LINK(drop_privileges)
)
#endif
AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,
(apr_pool_t *p), (p), OK, DECLINED)
+AP_IMPLEMENT_HOOK_RUN_ALL(int, drop_privileges,
+ (apr_pool_t * pchild, server_rec * s),
+ (pchild, s), OK, DECLINED)
#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES
@@ -1299,4 +1304,3 @@ AP_DECLARE(void) ap_mpm_register_timed_callback(apr_time_t t,
}
#endif /* AP_MPM_HAS_USER_CALLBACKS */
-