diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
| commit | c47fa42628b2119f7e37e83f22919bc905a53624 (patch) | |
| tree | 5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /net/server_select.lua | |
| parent | 46105d64bf9627c8618624281c966ec784f4fc12 (diff) | |
| parent | c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (diff) | |
| download | prosody-c47fa42628b2119f7e37e83f22919bc905a53624.tar.gz prosody-c47fa42628b2119f7e37e83f22919bc905a53624.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server_select.lua')
| -rw-r--r-- | net/server_select.lua | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 06deec32..9b8e41d9 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -286,6 +286,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport local disconnect = listeners.ondisconnect local drain = listeners.ondrain local onreadtimeout = listeners.onreadtimeout; + local detach = listeners.ondetach local bufferqueue = { } -- buffer array local bufferqueuelen = 0 -- end of buffer array @@ -317,11 +318,15 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport handler.onreadtimeout = onreadtimeout; handler.setlistener = function( self, listeners ) + if detach then + detach(self) -- Notify listener that it is no longer responsible for this connection + end dispatch = listeners.onincoming disconnect = listeners.ondisconnect status = listeners.onstatus drain = listeners.ondrain handler.onreadtimeout = listeners.onreadtimeout + detach = listeners.ondetach end handler.getstats = function( ) return readtraffic, sendtraffic |