httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1076614 - /httpd/httpd/trunk/server/mpm/worker/worker.c
Date Thu, 03 Mar 2011 13:16:14 GMT
Author: trawick
Date: Thu Mar  3 13:16:14 2011
New Revision: 1076614

URL: http://svn.apache.org/viewvc?rev=1076614&view=rev
Log:
worker: child_main() never returns, so remove some dead code after
one of the calls

Modified:
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1076614&r1=1076613&r2=1076614&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Thu Mar  3 13:16:14 2011
@@ -1331,6 +1331,7 @@ static int make_child(server_rec *s, int
         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
 
         apr_signal(SIGTERM, just_die);
         child_main(slot);
-
-        clean_child_exit(0);
+        /* NOTREACHED */
     }
     /* else */
     if (ap_scoreboard_image->parent[slot].pid != 0) {



Mime
View raw message