]> granicus.if.org Git - apache/commitdiff
the mpm-note-child-killed hook is just for state sync between
authorJeff Trawick <trawick@apache.org>
Wed, 30 Mar 2011 13:32:21 +0000 (13:32 +0000)
committerJeff Trawick <trawick@apache.org>
Wed, 30 Mar 2011 13:32:21 +0000 (13:32 +0000)
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

server/mpm/mpmt_os2/mpmt_os2.c
server/mpm/netware/mpm_netware.c

index b310ff98f70b75eddc258bd2da4a91e961963ddb..46d80f6172657a28734152885e8fc79cb47123a8 100644 (file)
@@ -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);
 }
 
 
index 547fb1adf021694df395683eb18ea650ca74346a..00b2b5ef674400059b6995a9292428a82d878fa0 100644 (file)
@@ -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);
 }