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
a735bf5c
Unverified
Commit
a735bf5c
authored
Sep 23, 2020
by
Oran Agra
Committed by
GitHub
Sep 23, 2020
Browse files
fix recently broken TLS build error, and add coverage for CI (#7833)
parent
c3edaa79
Changes
2
Hide whitespace changes
Inline
Side-by-side
.github/workflows/ci.yml
View file @
a735bf5c
...
@@ -9,7 +9,8 @@ jobs:
...
@@ -9,7 +9,8 @@ jobs:
steps
:
steps
:
-
uses
:
actions/checkout@v2
-
uses
:
actions/checkout@v2
-
name
:
make
-
name
:
make
run
:
make
# build with TLS just for compilatoin coverage
run
:
make BUILD_TLS=yes
-
name
:
test
-
name
:
test
run
:
|
run
:
|
sudo apt-get install tcl8.5
sudo apt-get install tcl8.5
...
...
src/tls.c
View file @
a735bf5c
...
@@ -454,7 +454,7 @@ void updateSSLEvent(tls_connection *conn) {
...
@@ -454,7 +454,7 @@ void updateSSLEvent(tls_connection *conn) {
}
}
static
void
tlsHandleEvent
(
tls_connection
*
conn
,
int
mask
)
{
static
void
tlsHandleEvent
(
tls_connection
*
conn
,
int
mask
)
{
int
ret
;
int
ret
,
conn_error
;
TLSCONN_DEBUG
(
"tlsEventHandler(): fd=%d, state=%d, mask=%d, r=%d, w=%d, flags=%d"
,
TLSCONN_DEBUG
(
"tlsEventHandler(): fd=%d, state=%d, mask=%d, r=%d, w=%d, flags=%d"
,
fd
,
conn
->
c
.
state
,
mask
,
conn
->
c
.
read_handler
!=
NULL
,
conn
->
c
.
write_handler
!=
NULL
,
fd
,
conn
->
c
.
state
,
mask
,
conn
->
c
.
read_handler
!=
NULL
,
conn
->
c
.
write_handler
!=
NULL
,
...
@@ -464,7 +464,7 @@ static void tlsHandleEvent(tls_connection *conn, int mask) {
...
@@ -464,7 +464,7 @@ static void tlsHandleEvent(tls_connection *conn, int mask) {
switch
(
conn
->
c
.
state
)
{
switch
(
conn
->
c
.
state
)
{
case
CONN_STATE_CONNECTING
:
case
CONN_STATE_CONNECTING
:
int
conn_error
=
connGetSocketError
((
connection
*
)
conn
);
conn_error
=
connGetSocketError
((
connection
*
)
conn
);
if
(
conn_error
)
{
if
(
conn_error
)
{
conn
->
c
.
last_errno
=
conn_error
;
conn
->
c
.
last_errno
=
conn_error
;
conn
->
c
.
state
=
CONN_STATE_ERROR
;
conn
->
c
.
state
=
CONN_STATE_ERROR
;
...
...
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