httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r543634 - /httpd/httpd/branches/1.3.x/src/main/http_main.c
Date Fri, 01 Jun 2007 22:02:49 GMT
Author: jim
Date: Fri Jun  1 15:02:48 2007
New Revision: 543634

URL: http://svn.apache.org/viewvc?view=rev&rev=543634
Log:
more cleanus of pid_table for killed/waited-for kiddies

Modified:
    httpd/httpd/branches/1.3.x/src/main/http_main.c

Modified: httpd/httpd/branches/1.3.x/src/main/http_main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/main/http_main.c?view=diff&rev=543634&r1=543633&r2=543634
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/http_main.c (original)
+++ httpd/httpd/branches/1.3.x/src/main/http_main.c Fri Jun  1 15:02:48 2007
@@ -2829,6 +2829,7 @@
 	    waitret = waitpid(pid, &status, WNOHANG);
 	    if (waitret == pid || waitret == -1) {
 		ap_scoreboard_image->parent[i].pid = 0;
+                unset_pid_table(pid);
 		continue;
 	    }
 	    ++not_dead_yet;
@@ -5173,6 +5174,7 @@
                     pid = ps->pid;
                     if (in_pid_table(pid)) {
                         kill(pid, SIG_TIMEOUT_KILL);
+                        unset_pid_table(pid);
                     }
                     else {
                         ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, server_conf,



Mime
View raw message