summaryrefslogtreecommitdiffstats
path: root/server/mpm
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2011-03-30 15:32:21 +0200
committerJeff Trawick <trawick@apache.org>2011-03-30 15:32:21 +0200
commit573a235d3b3a9f4fc8bf62a9e9be50ed19bcab4b (patch)
treefdf8073cf41189cff36efb63e6c4493480cda159 /server/mpm
parentClarification of pronoun - I had to read that sentence a few times to be cert... (diff)
downloadapache2-573a235d3b3a9f4fc8bf62a9e9be50ed19bcab4b.tar.xz
apache2-573a235d3b3a9f4fc8bf62a9e9be50ed19bcab4b.zip
the mpm-note-child-killed hook is just for state sync between
ap_{reclaim,relieve}_child_processes() and their callers the NetWare and OS/2 MPMs don't use that git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086948 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm')
-rw-r--r--server/mpm/mpmt_os2/mpmt_os2.c8
-rw-r--r--server/mpm/netware/mpm_netware.c7
2 files changed, 0 insertions, 15 deletions
diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c
index b310ff98f7..46d80f6172 100644
--- a/server/mpm/mpmt_os2/mpmt_os2.c
+++ b/server/mpm/mpmt_os2/mpmt_os2.c
@@ -450,13 +450,6 @@ static apr_status_t mpmt_os2_query(int query_code, int *result, apr_status_t *rv
-static const char *mpmt_os2_note_child_killed(int childnum)
-{
- ap_scoreboard_image->parent[childnum].pid = 0;
- return APR_SUCCESS;
-}
-
-
static const char *mpmt_os2_get_name(void)
{
@@ -539,7 +532,6 @@ static void mpmt_os2_hooks(apr_pool_t *p)
ap_hook_mpm(mpmt_os2_run, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_mpm_query(mpmt_os2_query, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_mpm_get_name(mpmt_os2_get_name, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_mpm_note_child_killed(mpmt_os2_note_child_killed, NULL, NULL, APR_HOOK_MIDDLE);
}
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 547fb1adf0..00b2b5ef67 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -251,12 +251,6 @@ static int netware_query(int query_code, int *result, apr_status_t *rv)
return OK;
}
-static apr_status_t netware_note_child_killed(int childnum)
-{
- ap_scoreboard_image->parent[childnum].pid = 0;
- return APR_SUCCESS;
-}
-
static const char *netware_get_name(void)
{
return "NetWare";
@@ -1092,7 +1086,6 @@ static void netware_mpm_hooks(apr_pool_t *p)
//ap_hook_open_logs(netware_open_logs, NULL, aszSucc, APR_HOOK_REALLY_FIRST);
ap_hook_mpm(netware_run, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_mpm_query(netware_query, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_mpm_note_child_killed(netware_note_child_killed, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_mpm_get_name(netware_get_name, NULL, NULL, APR_HOOK_MIDDLE);
}