diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-05 11:25:26 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-05 11:25:26 +0100 |
| commit | cca05af3d369ba4e53cd76f7e33196c5ee8415b4 (patch) | |
| tree | 3cf6088199b22392a519b5744cebe18cd40966e3 /net | |
| parent | 95eb788b3ee760d5677f48dbfcc8fd02b54d1a85 (diff) | |
| parent | 93b148715f75aa29947fa3181cdf22d8209431a8 (diff) | |
| download | prosody-cca05af3d369ba4e53cd76f7e33196c5ee8415b4.tar.gz prosody-cca05af3d369ba4e53cd76f7e33196c5ee8415b4.zip | |
Merge 0.7->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_event.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index be9e7f0a..dde13e61 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -161,7 +161,7 @@ do 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 @@ do -- Stub handlers function interface_mt:onconnect() + return self:onincoming(nil); end function interface_mt:onincoming() end |