RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-25 14:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: connection: conn->xprt is never NULL

Browse Source 
Let's remove this outdated test that's been there since 1.5. For quite
some time now xprt hasn't been NULL anymore on an initialized connection.
This commit is contained in:
Willy Tarreau 2019-11-28 18:08:49 +01:00
parent 70ccb2cddf
commit 8081abe26a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/connection.c
View File

@ -71,7 +71,7 @@ void conn_fd_handler(int fd)
conn->xprt_done_cb && conn->xprt_done_cb(conn) < 0) conn->xprt_done_cb && conn->xprt_done_cb(conn) < 0)
return; return;
if (conn->xprt && fd_send_ready(fd) && fd_send_active(fd)) { if (fd_send_ready(fd) && fd_send_active(fd)) {
/* force reporting of activity by clearing the previous flags : /* force reporting of activity by clearing the previous flags :
* we'll have at least ERROR or CONNECTED at the end of an I/O, * we'll have at least ERROR or CONNECTED at the end of an I/O,
* both of which will be detected below. * both of which will be detected below.
@ -99,7 +99,7 @@ void conn_fd_handler(int fd)
* that we must absolutely test conn->xprt at each step in case it suddenly * that we must absolutely test conn->xprt at each step in case it suddenly
* changes due to a quick unexpected close(). * changes due to a quick unexpected close().
*/ */
if (conn->xprt && fd_recv_ready(fd) && fd_recv_active(fd)) { if (fd_recv_ready(fd) && fd_recv_active(fd)) {
/* force reporting of activity by clearing the previous flags : /* force reporting of activity by clearing the previous flags :
* we'll have at least ERROR or CONNECTED at the end of an I/O, * we'll have at least ERROR or CONNECTED at the end of an I/O,
* both of which will be detected below. * both of which will be detected below.