aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-05 11:24:45 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-05 11:24:45 +0100
commit93b148715f75aa29947fa3181cdf22d8209431a8 (patch)
treead3ebb55f54f9faaf7ee0fdb96aa4de56cbf8d18
parent3376282d8aacc5814519e16c8b04809f24b9f248 (diff)
downloadprosody-93b148715f75aa29947fa3181cdf22d8209431a8.tar.gz
prosody-93b148715f75aa29947fa3181cdf22d8209431a8.zip
net.server_event: Be sure to fire onincoming for backwards-compatibility with pre-onconnect listeners (thanks darkrain/mod_console)
-rw-r--r--net/server_event.lua3
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