Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
44b76a75
Commit
44b76a75
authored
Jun 06, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
61074b43
52e56bf7
Changes
2
Show whitespace changes
Inline
Side-by-side
src/tls.c
View file @
44b76a75
...
@@ -217,7 +217,7 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
...
@@ -217,7 +217,7 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
SSL_CTX_set_ecdh_auto
(
ctx
,
1
);
SSL_CTX_set_ecdh_auto
(
ctx
,
1
);
#endif
#endif
if
(
SSL_CTX_use_certificate_file
(
ctx
,
ctx_config
->
cert_file
,
SSL_FILETYPE_PEM
)
<=
0
)
{
if
(
SSL_CTX_use_certificate_
chain_
file
(
ctx
,
ctx_config
->
cert_file
)
<=
0
)
{
ERR_error_string_n
(
ERR_get_error
(),
errbuf
,
sizeof
(
errbuf
));
ERR_error_string_n
(
ERR_get_error
(),
errbuf
,
sizeof
(
errbuf
));
serverLog
(
LL_WARNING
,
"Failed to load certificate: %s: %s"
,
ctx_config
->
cert_file
,
errbuf
);
serverLog
(
LL_WARNING
,
"Failed to load certificate: %s: %s"
,
ctx_config
->
cert_file
,
errbuf
);
goto
error
;
goto
error
;
...
...
tests/integration/psync2-pingoff.tcl
View file @
44b76a75
...
@@ -64,6 +64,7 @@ start_server {} {
...
@@ -64,6 +64,7 @@ start_server {} {
# make sure replication is still alive and kicking
# make sure replication is still alive and kicking
$R
(
1
)
incr x
$R
(
1
)
incr x
wait_for_condition 50 1000
{
wait_for_condition 50 1000
{
[
status $R
(
0
)
loading
]
== 0 &&
[
$R
(
0
)
get x
]
== 1
[
$R
(
0
)
get x
]
== 1
}
else
{
}
else
{
fail
"replica didn't get incr"
fail
"replica didn't get incr"
...
...
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