Merge remote-tracking branch 'origin/2.6' into 2.6

diff --git a/src/redis.c b/src/redis.c
index aa5a73f2abae195632463461416acf60c5c3f887..f26bdab0c09f3eada27552cab73c2be443887883 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1623,6 +1623,7 @@ int processCommand(redisClient *c) {
 
     /* Lua script too slow? Only allow commands with REDIS_CMD_STALE flag. */
     if (server.lua_timedout &&
+          c->cmd->proc != authCommand &&
         !(c->cmd->proc == shutdownCommand &&
           c->argc == 2 &&
           tolower(((char*)c->argv[1]->ptr)[0]) == 'n') &&