]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* It does not matter if this pid is still in the scoreboard or not. We need to
authorRuediger Pluem <rpluem@apache.org>
Mon, 4 Jun 2007 19:26:21 +0000 (19:26 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 4 Jun 2007 19:26:21 +0000 (19:26 +0000)
  remove it from our pid table in any case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@544218 13f79535-47bb-0310-9956-ffa450edef68

src/main/http_main.c

index f0ac8fc06234617592ac25e7b89e23d1ba59fb24..315027cb80e2a17b47408f6fb34e9934637d02d1 100644 (file)
@@ -5450,6 +5450,7 @@ static void standalone_main(int argc, char **argv)
             }
 #endif
            if (pid >= 0) {
+               unset_pid_table(pid);
                process_child_status(pid, status);
                /* non-fatal death... note that it's gone in the scoreboard. */
                ap_sync_scoreboard_image();
@@ -5458,7 +5459,6 @@ static void standalone_main(int argc, char **argv)
                if (child_slot >= 0) {
                    (void) ap_update_child_status(child_slot, SERVER_DEAD,
                                               (request_rec *) NULL);
-                   unset_pid_table(pid);
                    if (remaining_children_to_start
                        && child_slot < ap_daemons_limit) {
                        /* we're still doing a 1-for-1 replacement of dead