# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1270945831 -3600
# Node ID 61e103d995787b1bae5a69449f20e2b8fc22ee21
# Parent  e21c546368bd07ca6a768fa5cecb4c17b0b86a67# Parent  f9901175d535502fbfbe2f73b76b15be4d0823b8
Merge 0.7->trunk

diff -r e21c546368bd -r 61e103d99578 net/server_event.lua
--- a/net/server_event.lua	Sun Apr 11 01:20:20 2010 +0100
+++ b/net/server_event.lua	Sun Apr 11 01:30:31 2010 +0100
@@ -160,8 +160,8 @@
 			local callback = function( )
 				self:_lock( false,  false, false )
 				--vdebug( "start listening on client socket with id:", self.id )
-				self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT )  -- register callback
-				self:onincoming()
+				self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
+				(self.onconnect or self.onincoming)(self)
 				self.eventsession = nil
 				return -1
 			end