Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1086948 - in /httpd/httpd/trunk/server/mpm:
 mpmt_os2/mpmt_os2.c
 netware/mpm_netware.c
Date: Wed, 30 Mar 2011 13:32:21 -0000
To: cvs@httpd.apache.org
From: trawick@apache.org
Message-Id: <20110330133221.D5B9823888FD@eris.apache.org>

Author: trawick
Date: Wed Mar 30 13:32:21 2011
New Revision: 1086948

URL: http://svn.apache.org/viewvc?rev=1086948&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
    httpd/httpd/trunk/server/mpm/netware/mpm_netware.c

Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c?rev=1086948&r1=1086947&r2=1086948&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c (original)
+++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c Wed Mar 30 13:32:21 2011
@@ -450,13 +450,6 @@ static apr_status_t mpmt_os2_query(int q
 
 
 
-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);
 }
 
 

Modified: httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_netware.c?rev=1086948&r1=1086947&r2=1086948&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Wed Mar 30 13:32:21 2011
@@ -251,12 +251,6 @@ static int netware_query(int query_code,
     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
     //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);
 }