summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2016-05-08 18:04:53 +0200
committerantirez <antirez@gmail.com>2016-05-08 18:04:53 +0200
commit3b644e82b0cc96113e29672d1551248c9e9db893 (patch)
tree7c00ab06968c4202352dd3bbcf0545c4f788736e /src
parent8eb43bf72c2109092e498870869109419e13e895 (diff)
parentb44ad302d2337b45a02b6a3e4920089a48292c6d (diff)
downloadredis-3b644e82b0cc96113e29672d1551248c9e9db893.tar.gz
Merge branch 'unstable' of github.com:/antirez/redis into unstable
Diffstat (limited to 'src')
-rw-r--r--src/scripting.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scripting.c b/src/scripting.c
index 652cf140c..11adcf282 100644
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -839,6 +839,8 @@ void luaLoadLibraries(lua_State *lua) {
void luaRemoveUnsupportedFunctions(lua_State *lua) {
lua_pushnil(lua);
lua_setglobal(lua,"loadfile");
+ lua_pushnil(lua);
+ lua_setglobal(lua,"dofile");
}
/* This function installs metamethods in the global table _G that prevent