summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2018-12-21 17:11:52 +0100
committerantirez <antirez@gmail.com>2018-12-21 17:11:52 +0100
commit2a2990b80fb6d1d2fb009ba213b20cd8aedaa63d (patch)
tree2f31512fac62697c4781aac1cef4d481374cff18
parentd4c4a1b2a4b9483cbd7a1e4432089585d43b8be9 (diff)
downloadredis-2a2990b80fb6d1d2fb009ba213b20cd8aedaa63d.tar.gz
RESP3: allow HELLO during busy script and not authenticated states.
-rw-r--r--src/server.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c
index d85e10d95..6c7692ed7 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2582,7 +2582,9 @@ int processCommand(client *c) {
}
/* Check if the user is authenticated */
- if (server.requirepass && !c->authenticated && c->cmd->proc != authCommand)
+ if (server.requirepass &&
+ !c->authenticated &&
+ (c->cmd->proc != authCommand || c->cmd->proc == helloCommand))
{
flagTransaction(c);
addReply(c,shared.noautherr);
@@ -2715,6 +2717,7 @@ int processCommand(client *c) {
/* Lua script too slow? Only allow a limited number of commands. */
if (server.lua_timedout &&
c->cmd->proc != authCommand &&
+ c->cmd->proc != helloCommand &&
c->cmd->proc != replconfCommand &&
!(c->cmd->proc == shutdownCommand &&
c->argc == 2 &&