# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1273055126 -3600
# Node ID 87c378c77be388e36335d75a66f6a53fe2d49146
# Parent  0acfae4da19952aae1dd95242e1a3e9104cf6d3e# Parent  0c61f73ac0fb9636f9b38ee2808b5259303d46d0
Merge 0.7->trunk

diff -r 0acfae4da199 -r 87c378c77be3 net/server_event.lua
--- a/net/server_event.lua	Wed May 05 01:05:58 2010 +0100
+++ b/net/server_event.lua	Wed May 05 11:25:26 2010 +0100
@@ -161,7 +161,7 @@
 				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.onconnect or self.onincoming)(self)
+				self:onconnect()
 				self.eventsession = nil
 				return -1
 			end
@@ -437,6 +437,7 @@
 	
 	-- Stub handlers
 	function interface_mt:onconnect()
+		return self:onincoming(nil);
 	end
 	function interface_mt:onincoming()
 	end