diff options
| author | antirez <antirez@gmail.com> | 2013-05-28 15:23:42 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2013-05-28 15:26:55 +0200 |
| commit | 889d39b5baa36d7509c2162813e022716a1a1b07 (patch) | |
| tree | 749a6d41d8a1554b8935f175959806dc12b074d1 /src/redis.c | |
| parent | 1b87b3ef3873093f0a781ef087fd8a546460fc24 (diff) | |
| download | redis-889d39b5baa36d7509c2162813e022716a1a1b07.tar.gz | |
Accept REPLCONF in any state.
Diffstat (limited to 'src/redis.c')
| -rw-r--r-- | src/redis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/redis.c b/src/redis.c index 3bf05065e..0da88fb57 100644 --- a/src/redis.c +++ b/src/redis.c @@ -221,7 +221,7 @@ struct redisCommand redisCommandTable[] = { {"discard",discardCommand,1,"rs",0,NULL,0,0,0,0,0}, {"sync",syncCommand,1,"ars",0,NULL,0,0,0,0,0}, {"psync",syncCommand,3,"ars",0,NULL,0,0,0,0,0}, - {"replconf",replconfCommand,-1,"ars",0,NULL,0,0,0,0,0}, + {"replconf",replconfCommand,-1,"arslt",0,NULL,0,0,0,0,0}, {"flushdb",flushdbCommand,1,"w",0,NULL,0,0,0,0,0}, {"flushall",flushallCommand,1,"w",0,NULL,0,0,0,0,0}, {"sort",sortCommand,-2,"wm",0,NULL,1,1,1,0,0}, @@ -1772,9 +1772,10 @@ int processCommand(redisClient *c) { return REDIS_OK; } - /* Lua script too slow? Only allow commands with REDIS_CMD_STALE flag. */ + /* Lua script too slow? Only allow a limited number of commands. */ if (server.lua_timedout && c->cmd->proc != authCommand && + c->cmd->proc != replconfCommand && !(c->cmd->proc == shutdownCommand && c->argc == 2 && tolower(((char*)c->argv[1]->ptr)[0]) == 'n') && |