diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-04-11 01:30:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-04-11 01:30:31 +0100 |
| commit | 0772ba2e42ed267f4a0c41cb3eab574589a1e0f4 (patch) | |
| tree | b64a5805486d7ab1519be14d057bd6ba30cb47ff | |
| parent | 41d92dbecaab314eded4335a905e0bf3dfa3b4a1 (diff) | |
| parent | e0c9c76b44e32e17f17b06e546e5283728fdb706 (diff) | |
| download | prosody-0772ba2e42ed267f4a0c41cb3eab574589a1e0f4.tar.gz prosody-0772ba2e42ed267f4a0c41cb3eab574589a1e0f4.zip | |
Merge 0.7->trunk
| -rw-r--r-- | net/server_event.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 5e62f3fd..be9e7f0a 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -160,8 +160,8 @@ do 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 |