 ===================================================================
 --- sope-core/NGStreams/ChangeLog	(revision 1664)
 +++ sope-core/NGStreams/ChangeLog	(working copy)
-@@ -1,3 +1,20 @@
+@@ -1,3 +1,27 @@
++2010-01-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
++
++	* NGActiveSocket.m (-safeReadBytes:count:): explicitly make use of
++	[NGEndOfStreamException alloc] when allocating localException,
++	since the init method is only present in that class and this may
++	cause a crash on rare occasions.
++
 +2010-01-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 +
 +	* NGCTextStream.m (-writeString:): use

===================================================================
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h	(revision 1664)
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h	(working copy)
@@ -46,7 +46,6 @@
   NSMutableArray         *delayedResponses;
 }
 

 
 - (void)registerForEvents {
   int backlog;
+  WOChildMessage message;
+
+  controlSocket = [[WOCoreApplication application] controlSocket];
+  if (controlSocket) {
+    [controlSocket retain];
+    ASSIGN(self->socket, [[WOCoreApplication application] listeningSocket]);
+    [[NSNotificationCenter defaultCenter]
+                         addObserver:self
