Merge 0.10->trunk

[prosody.git] / plugins / mod_net_multiplex.lua

diff --git a/plugins/mod_net_multiplex.lua b/plugins/mod_net_multiplex.lua
index 44e1c1ee6df28159e400faef8ccbd78260e1f80b..0dd3dc67709dc308e0281c1a29bd9cad5d9ccdeb 100644 (file)
--- 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,7 +56,9 @@ function listener.ondisconnect(conn, err)
        buffers[conn] = nil; -- warn if no buffer?
 end
 
-module:add_item("net-provider", {
+listener.ondetach = listener.ondisconnect;
+
+module:provides("net", {
        name = "multiplex";
        config_prefix = "";
        listener = listener;