diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2016-11-18 10:45:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 10:45:09 +0100 |
| commit | 5b83fa482c1b82995a52c7ae549dbf550cbb0d07 (patch) | |
| tree | 392acb22a007a0174717857e4f1dd2da9036a6c3 | |
| parent | 8fb3ad244474612d8ba53a6a7ba715a325538371 (diff) | |
| parent | 13a92a5bb1bed9dc34442613b65d6bc1b43a6b7e (diff) | |
| download | redis-5b83fa482c1b82995a52c7ae549dbf550cbb0d07.tar.gz | |
Merge pull request #3612 from deep011/unstable
fix a possible bug for 'replconf getack'
| -rw-r--r-- | src/replication.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/replication.c b/src/replication.c index 1a9b2e574..a3b4ab54c 100644 --- a/src/replication.c +++ b/src/replication.c @@ -837,7 +837,7 @@ void replconfCommand(client *c) { /* REPLCONF GETACK is used in order to request an ACK ASAP * to the slave. */ if (server.masterhost && server.master) replicationSendAck(); - /* Note: this command does not reply anything! */ + return; } else { addReplyErrorFormat(c,"Unrecognized REPLCONF option: %s", (char*)c->argv[j]->ptr); |