X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=e6a23d8e703f6fb172f188d45a6e87a089fde333;hb=b2525af97794a6cd3598d414b2d0e1abe44a756c;hp=8fcee8e840e45f795f9bd64ed0a22861352c7df4;hpb=e381f159ff44b9f8d89fe93d8cc525c4d839e9ef;p=prosody.git diff --git a/prosody b/prosody index 8fcee8e8..e6a23d8e 100755 --- a/prosody +++ b/prosody @@ -151,9 +151,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 +292,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"