httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r544218 - /httpd/httpd/branches/1.3.x/src/main/http_main.c
Date Mon, 04 Jun 2007 19:26:24 GMT
Author: rpluem
Date: Mon Jun  4 12:26:21 2007
New Revision: 544218

URL: http://svn.apache.org/viewvc?view=rev&rev=544218
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/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=544218&r1=544217&r2=544218
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/http_main.c (original)
+++ httpd/httpd/branches/1.3.x/src/main/http_main.c Mon Jun  4 12:26:21 2007
@@ -5450,6 +5450,7 @@
             }
 #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 @@
 		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



Mime
View raw message