Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r595464 -
 /httpd/httpd/branches/1.3.x/src/main/http_main.c
Date: Thu, 15 Nov 2007 21:31:17 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20071115213117.CC4CB1A9832@eris.apache.org>

Author: jim
Date: Thu Nov 15 13:31:15 2007
New Revision: 595464

URL: http://svn.apache.org/viewvc?rev=595464&view=rev
Log:
Apply Jeff's patch...

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?rev=595464&r1=595463&r2=595464&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/http_main.c (original)
+++ httpd/httpd/branches/1.3.x/src/main/http_main.c Thu Nov 15 13:31:15 2007
@@ -2661,7 +2661,6 @@
 	    if (status == SERVER_DEAD) {
 		ss->my_access_count = 0L;
 		ss->my_bytes_served = 0L;
-                ap_scoreboard_image->parent[child_num].pid = 0;
 	    }
 	    ss->conn_count = (unsigned short) 0;
 	    ss->conn_bytes = (unsigned long) 0;
@@ -2689,7 +2688,10 @@
 	    ss->vhostrec =  r->server;
 	}
     }
-    if (status == SERVER_STARTING && r == NULL) {
+    if (status == SERVER_DEAD) {
+        ap_scoreboard_image->parent[child_num].pid = 0;
+    }
+    else if (status == SERVER_STARTING && r == NULL) {
 	/* clean up the slot's vhostrec pointer (maybe re-used)
 	 * and mark the slot as belonging to a new generation.
 	 */