]> 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>
Sat, 2 Jun 2007 21:13:27 +0000 (21:13 +0000)
committerRuediger Pluem <rpluem@apache.org>
Sat, 2 Jun 2007 21:13:27 +0000 (21:13 +0000)
  remove it from our pid table in any case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-pid-table@543785 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/mpmt_os2/mpmt_os2.c

index 1d6377fc60c20daa60ac6371b41554a0bffba8c1..1d4a43d4b0592661348b83a054e0c8164613494c 100644 (file)
@@ -308,13 +308,13 @@ static char master_main()
         rc = DosWaitChild(DCWA_PROCESSTREE, DCWW_NOWAIT, &proc_rc, &child_pid, 0);
 
         if (rc == 0) {
+            ap_unset_pid_table(child_pid);
             /* A child has terminated, remove its scoreboard entry & terminate if necessary */
             for (slot=0; ap_scoreboard_image->parent[slot].pid != child_pid && slot < HARD_SERVER_LIMIT; slot++);
 
             if (slot < HARD_SERVER_LIMIT) {
                 ap_scoreboard_image->parent[slot].pid = 0;
                 ap_scoreboard_image->parent[slot].quiescing = 0;
-                ap_unset_pid_table(child_pid);
 
                 if (proc_rc.codeTerminate == TC_EXIT) {
                     /* Child terminated normally, check its exit code and