aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_event.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-02 22:34:32 +0200
committerKim Alvefur <zash@zash.se>2014-09-02 22:34:32 +0200
commitc47fa42628b2119f7e37e83f22919bc905a53624 (patch)
tree5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /net/server_event.lua
parent46105d64bf9627c8618624281c966ec784f4fc12 (diff)
parentc80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (diff)
downloadprosody-c47fa42628b2119f7e37e83f22919bc905a53624.tar.gz
prosody-c47fa42628b2119f7e37e83f22919bc905a53624.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server_event.lua')
-rw-r--r--net/server_event.lua11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 52c1e9c1..480d876d 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -439,9 +439,11 @@ do
end
function interface_mt:setlistener(listener)
- self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, self.onreadtimeout, self.onstatus
- = listener.onconnect, listener.ondisconnect, listener.onincoming,
- listener.ontimeout, listener.onreadtimeout, listener.onstatus;
+ self:ondetach(); -- Notify listener that it is no longer responsible for this connection
+ self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout,
+ self.onreadtimeout, self.onstatus, self.ondetach
+ = listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout,
+ listener.onreadtimeout, listener.onstatus, listener.ondetach;
end
-- Stub handlers
@@ -461,6 +463,8 @@ do
end
function interface_mt:ondrain()
end
+ function interface_mt:ondetach()
+ end
function interface_mt:onstatus()
end
end
@@ -488,6 +492,7 @@ do
ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs
onreadtimeout = listener.onreadtimeout; -- called when socket inactivity timeout occurs
ondrain = listener.ondrain; -- called when writebuffer is empty
+ ondetach = listener.ondetach; -- called when disassociating this listener from this connection
onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS)
eventread = false, eventwrite = false, eventclose = false,
eventhandshake = false, eventstarthandshake = false; -- event handler