httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r543785 - /httpd/httpd/branches/httpd-pid-table/server/mpm/mpmt_os2/mpmt_os2.c
Date Sat, 02 Jun 2007 21:13:27 GMT
Author: rpluem
Date: Sat Jun  2 14:13:27 2007
New Revision: 543785

URL: http://svn.apache.org/viewvc?view=rev&rev=543785
Log:
* It does not matter if this pid is still in the scoreboard or not. We need to
  remove it from our pid table in any case.

Modified:
    httpd/httpd/branches/httpd-pid-table/server/mpm/mpmt_os2/mpmt_os2.c

Modified: httpd/httpd/branches/httpd-pid-table/server/mpm/mpmt_os2/mpmt_os2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-pid-table/server/mpm/mpmt_os2/mpmt_os2.c?view=diff&rev=543785&r1=543784&r2=543785
==============================================================================
--- httpd/httpd/branches/httpd-pid-table/server/mpm/mpmt_os2/mpmt_os2.c (original)
+++ httpd/httpd/branches/httpd-pid-table/server/mpm/mpmt_os2/mpmt_os2.c Sat Jun  2 14:13:27
2007
@@ -308,13 +308,13 @@
         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



Mime
View raw message