Merge 0.10->trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/prosody b/prosody
index 8fcee8e8..aab803c5 100755
--- a/prosody
+++ b/prosody
@@ -153,7 +153,12 @@ function sandbox_require()
 	local _real_require = require;
 	if not getfenv then
 		-- 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
+		function getfenv(f)
+			local name, env = debug.getupvalue(debug.getinfo(f or 1).func, 1);
+			if name == "_ENV" then
+				return env;
+			end
+		end
 	end
 	function require(...)
 		local curr_env = getfenv(2);