Scripting: globals protection can now be switched on/off.

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index bfac279f490cb459b140983b56d005a1552dda0b..9966f945a86ab22229147bc52d7c38c5e3dde490 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1067,6 +1067,7 @@ void initServerConfig() {
     server.lua_time_limit = REDIS_LUA_TIME_LIMIT;
     server.lua_client = NULL;
     server.lua_timedout = 0;
+    server.lua_protect_globals = 1;
 
     updateLRUClock();
     resetServerSaveParams();
@@ -2251,8 +2252,12 @@ void daemonize(void) {
 }
 
 void version() {
-    printf("Redis server v=%s sha=%s:%d malloc=%s\n", REDIS_VERSION,
-        redisGitSHA1(), atoi(redisGitDirty()) > 0, ZMALLOC_LIB);
+    printf("Redis server v=%s sha=%s:%d malloc=%s bits=%d\n",
+        REDIS_VERSION,
+        redisGitSHA1(),
+        atoi(redisGitDirty()) > 0,
+        ZMALLOC_LIB,
+        sizeof(long) == 4 ? 32 : 64);
     exit(0);
 }