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 /plugins/mod_net_multiplex.lua | |
| parent | 46105d64bf9627c8618624281c966ec784f4fc12 (diff) | |
| parent | c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (diff) | |
| download | prosody-c47fa42628b2119f7e37e83f22919bc905a53624.tar.gz prosody-c47fa42628b2119f7e37e83f22919bc905a53624.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_net_multiplex.lua')
| -rw-r--r-- | plugins/mod_net_multiplex.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_net_multiplex.lua b/plugins/mod_net_multiplex.lua index d666b907..0dd3dc67 100644 --- a/plugins/mod_net_multiplex.lua +++ b/plugins/mod_net_multiplex.lua @@ -34,7 +34,6 @@ end function listener.onincoming(conn, data) if not data then return; end local buf = buffers[conn]; - buffers[conn] = nil; buf = buf and buf..data or data; for service, multiplex_pattern in pairs(available_services) do if buf:match(multiplex_pattern) then @@ -57,6 +56,8 @@ function listener.ondisconnect(conn, err) buffers[conn] = nil; -- warn if no buffer? end +listener.ondetach = listener.ondisconnect; + module:provides("net", { name = "multiplex"; config_prefix = ""; |