 ===================================================================
 --- sope-appserver/NGObjWeb/ChangeLog	(revision 1664)
 +++ sope-appserver/NGObjWeb/ChangeLog	(working copy)
-@@ -1,3 +1,177 @@
+@@ -1,3 +1,184 @@
++2010-02-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
++
++	* WOWatchDogApplicationMain.m (_spawnChild:): we set a timeout of
++	1 second to the parent-side child control socket to avoid hang on
++	status reads when the child dies before the message reaches the
++	parent.
++
 +2010-02-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 +
 +	* WOWatchDogApplicationMain.m (-run:argc:argv:): we assign the

 }
 #endif
 
@@ -421,8 +996,8 @@
 
 @interface NSUserDefaults(ServerDefaults)
 + (id)hackInServerDefaults:(NSUserDefaults *)_ud

 #if defined(__CYGWIN32__) || defined(__MINGW32__)
 
 int WOWatchDogApplicationMain
@@ -39,201 +60,876 @@
 #include <time.h>
 #include <string.h>
 
