From: Jeff Trawick <trawick@apache.org>
Date: Thu, 3 Mar 2011 13:16:14 +0000 (+0000)
Subject: worker: child_main() never returns, so remove some dead code after
X-Git-Tag: 2.3.12~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a8638aca668a923d65a05ceb1bf201e9313972;p=thirdparty%2Fapache%2Fhttpd.git

worker: child_main() never returns, so remove some dead code after
one of the calls


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

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 28df0637beb..07ecc7c28fc 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1331,6 +1331,7 @@ static int make_child(server_rec *s, int slot)
         set_signals();
         ap_scoreboard_image->parent[slot].pid = getpid();
         child_main(slot);
+        /* NOTREACHED */
     }
 
     if ((pid = fork()) == -1) {
@@ -1367,8 +1368,7 @@ static int make_child(server_rec *s, int slot)
 
         apr_signal(SIGTERM, just_die);
         child_main(slot);
-
-        clean_child_exit(0);
+        /* NOTREACHED */
     }
     /* else */
     if (ap_scoreboard_image->parent[slot].pid != 0) {