Commit 5b83fa48 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #3612 from deep011/unstable

fix a possible bug for 'replconf getack'
parents 8fb3ad24 13a92a5b
...@@ -837,7 +837,7 @@ void replconfCommand(client *c) { ...@@ -837,7 +837,7 @@ void replconfCommand(client *c) {
/* REPLCONF GETACK is used in order to request an ACK ASAP /* REPLCONF GETACK is used in order to request an ACK ASAP
* to the slave. */ * to the slave. */
if (server.masterhost && server.master) replicationSendAck(); if (server.masterhost && server.master) replicationSendAck();
/* Note: this command does not reply anything! */ return;
} else { } else {
addReplyErrorFormat(c,"Unrecognized REPLCONF option: %s", addReplyErrorFormat(c,"Unrecognized REPLCONF option: %s",
(char*)c->argv[j]->ptr); (char*)c->argv[j]->ptr);
......
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