Merge 0.10->trunk

[prosody.git] / net / server_event.lua

diff --git a/net/server_event.lua b/net/server_event.lua
index 34cda0261a31ee2489ab5f622656fd6eb886108f..677586645fd233b010ce82f66a169082d0a0ac86 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -614,6 +614,7 @@ local function handleserver( server, addr, port, pattern, listener, sslctx )  --
        local interface = {
                _connections = 0;
 
+               type = "server";
                conn = server;
                onconnect = listener.onconnect;  -- will be called when new client connected
                eventread = false;  -- read event handler
@@ -807,6 +808,7 @@ local function add_task(delay, callback)
                end
        end
        , delay);
+       return event_handle;
 end
 
 return {