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

BUG/MINOR: ssl: do not call directly the conn_fd_handler from async_fd_handler

Browse Source 
This patch modifies the way to re-enable the connection from the async fd
handler calling conn_update_sock_polling instead of the conn_fd_handler.

It also ensures that the polling is really stopped on the async fd.
This commit is contained in:
Emeric Brun 2017-06-02 15:54:06 +00:00 committed by Willy Tarreau
parent b5e42a817b
commit bbc165447e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl_sock.c
View File

@ -369,17 +369,19 @@ fail_get:
static void ssl_async_fd_handler(int fd)
{
struct connection *conn = fdtab[fd].owner;
int conn_fd = conn->t.sock.fd;
/* fd is an async enfine fd, we must stop
* to poll this fd until it is requested
*/
fd_stop_recv(fd);
fd_cant_recv(fd);
/* crypto engine is available, let's notify the associated
* connection that it can pursue its processing.
*/
conn_fd_handler(conn_fd);
__conn_sock_want_recv(conn);
__conn_sock_want_send(conn);
conn_update_sock_polling(conn);
}
/*