Software / code / prosody
Changeset
2973:61e103d99578
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 11 Apr 2010 01:30:31 +0100 |
| parents | 2971:e21c546368bd (current diff) 2972:f9901175d535 (diff) |
| children | 2974:f37dc6f038f3 3011:1189a29cd846 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
