From: Jeff Trawick <trawick@apache.org>
Date: Sat, 22 Nov 2003 20:43:25 +0000 (+0000)
Subject: build with latest other-child API changes
X-Git-Tag: pre_ajp_proxy~1021
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f5ba4e44d5c28747ff8b9d5b5c9976773bbbf7b;p=thirdparty%2Fapache%2Fhttpd.git

build with latest other-child API changes


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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index c06b258dd42..e447e9c20fe 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1044,7 +1044,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 		}
 #if APR_HAS_OTHER_CHILD
 	    }
-	    else if (apr_proc_other_child_read(&pid, status) == 0) {
+	    else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH, status) == APR_SUCCESS) {
 		/* handled */
 #endif
 	    }
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 214c1be94f0..51ba206e777 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -193,7 +193,7 @@ void ap_reclaim_child_processes(int terminate)
         }
 
 #if APR_HAS_OTHER_CHILD
-        apr_proc_other_child_check();
+        apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART);
 #endif
 
         if (!not_dead_yet) {