Merge 0.10->trunk

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 99ddc720aa570fb02765191ca6b1c47eaddaaee0..38cf8f08268ad5fa1940980907571018444c2bca 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -2,14 +2,17 @@
 local log = require "util.logger".init("net.connlisteners");
 local traceback = debug.traceback;
 
-module "httpserver"
+local _ENV = nil;
 
-function fail()
-       log("error", "Attempt to use legacy connlisteners API. For more info see http://prosody.im/doc/developers/network");
+local function fail()
+       log("error", "Attempt to use legacy connlisteners API. For more info see https://prosody.im/doc/developers/network");
        log("error", "Legacy connlisteners API usage, %s", traceback("", 2));
 end
 
-register, deregister = fail, fail;
-get, start = fail, fail, epic_fail;
-
-return _M;
+return {
+       register = fail;
+       register = fail;
+       get = fail;
+       start = fail;
+       -- epic fail
+};