diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-02 22:33:11 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-02 22:33:11 +0200 |
| commit | ab57f00b936342c599aadf901f85e5b29ee91baa (patch) | |
| tree | b4ffbcba45331b7fa86a9e1d1881e94b8fef9d42 /net/server_select.lua | |
| parent | e41db733ad45978e4b3193af348c220623125a0e (diff) | |
| parent | 3d6dafb89a05a6aad4d102266172e377d9491360 (diff) | |
| download | prosody-ab57f00b936342c599aadf901f85e5b29ee91baa.tar.gz prosody-ab57f00b936342c599aadf901f85e5b29ee91baa.zip | |
Merge 0.9->0.10
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 6308e62f..d2192f0a 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -285,6 +285,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 @@ -316,11 +317,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 |