r2164 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-23 14:41:23 +0200 (Tue, 23 Oct 2007)
New Revision: 2164

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/mgt_child.c
Log:
Merged revisions 2157 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2157 | phk | 2007-10-23 11:23:04 +0200 (Tue, 23 Oct 2007) | 2 lines
  
  Quench a pointless sigchild warning
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2154,2161-2162
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2154,2157,2161-2162

Modified: branches/1.2/bin/varnishd/mgt_child.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_child.c	2007-10-23 12:38:19 UTC (rev 2163)
+++ branches/1.2/bin/varnishd/mgt_child.c	2007-10-23 12:41:23 UTC (rev 2164)
@@ -304,14 +304,10 @@
 	}
 	ev_poker = NULL;
 
-	r = wait4(-1, &status, WNOHANG, NULL);
-	if (r == 0)
+	r = wait4(child_pid, &status, WNOHANG, NULL);
+	if (r == 0 || (r == -1 && errno == ECHILD))
 		return (0);
-	if (r != child_pid || r == -1) {
-		fprintf(stderr, "Unknown child died pid=%d status=0x%x\n",
-		    r, status);
-		return (0);
-	}
+	assert(r == child_pid);
 	fprintf(stderr, "Cache child died pid=%d status=0x%x\n", r, status);
 	child_pid = -1;