]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
worker: child_main() never returns, so remove some dead code after
authorJeff Trawick <trawick@apache.org>
Thu, 3 Mar 2011 13:16:14 +0000 (13:16 +0000)
committerJeff Trawick <trawick@apache.org>
Thu, 3 Mar 2011 13:16:14 +0000 (13:16 +0000)
one of the calls

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

server/mpm/worker/worker.c

index 28df0637beb14ccb774243573d6e478ae584b294..07ecc7c28fce8ba37a1cec0da58b83751014af5a 100644 (file)
@@ -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) {