Merge pull request #3612 from deep011/unstable

fix a possible bug for 'replconf getack'
This commit is contained in:
Salvatore Sanfilippo 2016-11-18 10:45:09 +01:00 committed by GitHub
commit 5b83fa482c

View File

@ -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);