Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
5b83fa48
Commit
5b83fa48
authored
Nov 18, 2016
by
Salvatore Sanfilippo
Committed by
GitHub
Nov 18, 2016
Browse files
Merge pull request #3612 from deep011/unstable
fix a possible bug for 'replconf getack'
parents
8fb3ad24
13a92a5b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/replication.c
View file @
5b83fa48
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment