summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2011-03-03 14:16:14 +0100
committerJeff Trawick <trawick@apache.org>2011-03-03 14:16:14 +0100
commitb7a8638aca668a923d65a05ceb1bf201e9313972 (patch)
tree6118fc94f30e48ddd92d1f6d80b01083c01fdcf6
parentBuild mod_authn_socache on same terms as other authn modules (diff)
downloadapache2-b7a8638aca668a923d65a05ceb1bf201e9313972.tar.xz
apache2-b7a8638aca668a923d65a05ceb1bf201e9313972.zip
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
-rw-r--r--server/mpm/worker/worker.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 28df0637be..07ecc7c28f 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) {