Software / code / prosody
Changeset
2989:87c378c77be3
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 05 May 2010 11:25:26 +0100 |
| parents | 2987:0acfae4da199 (current diff) 2988:0c61f73ac0fb (diff) |
| children | 2998:36c169ed1576 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
