Unverified Commit 8183a4ca authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #7369 from oranagra/no_reject_watch

Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD
parents 265a7e7e 2fa077b0
...@@ -776,11 +776,11 @@ struct redisCommand redisCommandTable[] = { ...@@ -776,11 +776,11 @@ struct redisCommand redisCommandTable[] = {
0,NULL,0,0,0,0,0,0}, 0,NULL,0,0,0,0,0,0},
{"watch",watchCommand,-2, {"watch",watchCommand,-2,
"no-script fast @transaction", "no-script fast ok-loading ok-stale @transaction",
0,NULL,1,-1,1,0,0,0}, 0,NULL,1,-1,1,0,0,0},
{"unwatch",unwatchCommand,1, {"unwatch",unwatchCommand,1,
"no-script fast @transaction", "no-script fast ok-loading ok-stale @transaction",
0,NULL,0,0,0,0,0,0}, 0,NULL,0,0,0,0,0,0},
{"cluster",clusterCommand,-2, {"cluster",clusterCommand,-2,
...@@ -3627,6 +3627,8 @@ int processCommand(client *c) { ...@@ -3627,6 +3627,8 @@ int processCommand(client *c) {
c->cmd->proc != multiCommand && c->cmd->proc != multiCommand &&
c->cmd->proc != execCommand && c->cmd->proc != execCommand &&
c->cmd->proc != discardCommand && c->cmd->proc != discardCommand &&
c->cmd->proc != watchCommand &&
c->cmd->proc != unwatchCommand &&
!(c->cmd->proc == shutdownCommand && !(c->cmd->proc == shutdownCommand &&
c->argc == 2 && c->argc == 2 &&
tolower(((char*)c->argv[1]->ptr)[0]) == 'n') && tolower(((char*)c->argv[1]->ptr)[0]) == 'n') &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment