projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20d6e6e
)
prosody: Fix getfenv replacement for Lua 5.2
author
Kim Alvefur
<zash@zash.se>
Wed, 17 Sep 2014 12:50:00 +0000
(14:50 +0200)
committer
Kim Alvefur
<zash@zash.se>
Wed, 17 Sep 2014 12:50:00 +0000
(14:50 +0200)
prosody
patch
|
blob
|
history
diff --git
a/prosody
b/prosody
index 8fcee8e840e45f795f9bd64ed0a22861352c7df4..aab803c5b8c71c16ce616a7b0ccb09ef617f4318 100755
(executable)
--- 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);