Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Sun, 11 Apr 2010 01:30:31 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Sun, 11 Apr 2010 01:30:31 +0100
- changeset 2973
- 61e103d99578
- parent 2971
- e21c546368bd (current diff)
- parent 2972
- f9901175d535 (diff)
- child 2974
- f37dc6f038f3
- child 3011
- 1189a29cd846
Merge 0.7->trunk
--- 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
