X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=61be6c2e29218d4e16c4bb0949c9c55d72cb0bac;hb=79a152bb61900a86c486b62d59be60fa845f8afc;hp=8fcee8e840e45f795f9bd64ed0a22861352c7df4;hpb=e381f159ff44b9f8d89fe93d8cc525c4d839e9ef;p=prosody.git

diff --git a/prosody b/prosody
index 8fcee8e8..61be6c2e 100755
--- a/prosody
+++ b/prosody
@@ -121,6 +121,7 @@ end
 
 function load_libraries()
 	-- Load socket framework
+	socket = require "socket";
 	server = require "net.server"
 end	
 
@@ -151,9 +152,12 @@ function sandbox_require()
 	-- for neat sandboxing of modules
 	local _realG = _G;
 	local _real_require = require;
-	if not getfenv then
+	local getfenv = getfenv or function (f)
 		-- FIXME: This is a hack to replace getfenv() in Lua 5.2
-		function getfenv(f) return debug.getupvalue(debug.getinfo(f or 1).func, 1); end
+		local name, env = debug.getupvalue(debug.getinfo(f or 1).func, 1);
+		if name == "_ENV" then
+			return env;
+		end
 	end
 	function require(...)
 		local curr_env = getfenv(2);
@@ -289,6 +293,7 @@ function load_secondary_libraries()
 	require "util.import"
 	require "util.xmppstream"
 	require "core.stanza_router"
+	require "core.statsmanager"
 	require "core.hostmanager"
 	require "core.portmanager"
 	require "core.modulemanager"