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
f42ac40d
Unverified
Commit
f42ac40d
authored
Sep 20, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Sep 20, 2019
Browse files
Merge pull request #6397 from trevor211/fixConfigWrongFormatHandling
Fix bad handling of unexpected yesno option
parents
474a9231
74e3a622
Changes
1
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
f42ac40d
...
@@ -672,6 +672,9 @@ void loadServerConfigFromString(char *config) {
...
@@ -672,6 +672,9 @@ void loadServerConfigFromString(char *config) {
server
.
lua_time_limit
=
strtoll
(
argv
[
1
],
NULL
,
10
);
server
.
lua_time_limit
=
strtoll
(
argv
[
1
],
NULL
,
10
);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"lua-replicate-commands"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"lua-replicate-commands"
)
&&
argc
==
2
)
{
server
.
lua_always_replicate_commands
=
yesnotoi
(
argv
[
1
]);
server
.
lua_always_replicate_commands
=
yesnotoi
(
argv
[
1
]);
if
((
server
.
lua_always_replicate_commands
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"slowlog-log-slower-than"
)
&&
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"slowlog-log-slower-than"
)
&&
argc
==
2
)
argc
==
2
)
{
{
...
...
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