RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: ssl_sock: make use of CO_FL_WILL_UPDATE

Browse Source 
Now when ssl_sock_{to,from}_buf are called, if the connection doesn't
feature CO_FL_WILL_UPDATE, they will first retrieve the updated flags
using conn_refresh_polling_flags() before changing any flag, then call
conn_cond_update_sock_polling() before leaving, to commit such changes.
This commit is contained in:
Willy Tarreau 2017-10-25 09:32:15 +02:00
parent 256b9c5993
commit 31d4dbe825
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ssl_sock.c
View File

@ -4851,6 +4851,8 @@ static int ssl_sock_to_buf(struct connection *conn, struct buffer *buf, int coun
int ret, done = 0;
int try;
conn_refresh_polling_flags(conn);
if (!conn->xprt_ctx)
goto out_error;
@ -4936,18 +4938,20 @@ static int ssl_sock_to_buf(struct connection *conn, struct buffer *buf, int coun
goto out_error;
}
}
leave:
conn_cond_update_sock_polling(conn);
return done;
read0:
conn_sock_read0(conn);
return done;
goto leave;
out_error:
/* Clear openssl global errors stack */
ssl_sock_dump_errors(conn);
ERR_clear_error();
conn->flags |= CO_FL_ERROR;
return done;
goto leave;
}
@ -4966,6 +4970,7 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl
int ret, try, done;
done = 0;
conn_refresh_polling_flags(conn);
if (!conn->xprt_ctx)
goto out_error;
@ -5043,6 +5048,8 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl
goto out_error;
}
}
leave:
conn_cond_update_sock_polling(conn);
return done;
out_error:
@ -5051,7 +5058,7 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl
ERR_clear_error();
conn->flags |= CO_FL_ERROR;
return done;
goto leave;
}
static void ssl_sock_close(struct connection *conn) {