root
/
redis
mirror of https://github.com/redis/redis.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix recently broken TLS build error, and add coverage for CI (#7833)

This commit is contained in:
Oran Agra 2020-09-23 11:30:24 +03:00 committed by GitHub
parent c3edaa7941
commit a735bf5c2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -9,7 +9,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: make
run: make
# build with TLS just for compilatoin coverage
run: make BUILD_TLS=yes
- name: test
run: |
sudo apt-get install tcl8.5

4
src/tls.c
View File

@ -454,7 +454,7 @@ void updateSSLEvent(tls_connection *conn) {
}
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",
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) {
switch (conn->c.state) {
case CONN_STATE_CONNECTING:
int conn_error = connGetSocketError((connection *) conn);
conn_error = connGetSocketError((connection *) conn);
if (conn_error) {
conn->c.last_errno = conn_error;
conn->c.state = CONN_STATE_ERROR;