upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-27 21:06:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

BUG/MINOR: checks: don't mark the FD as closed before transport close

Browse source 
Some future transport layers might need the connection's file descriptor
on ->close(), so we must not destroy it before we're finished with it.
This commit is contained in:
Willy Tarreau 2012-11-23 09:05:05 +01:00
parent a522f801fb
commit ef8a719f70
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/checks.c
View file

@ -1430,10 +1430,10 @@ static struct task *process_chk(struct task *t)
set_server_up(s);
}
conn->t.sock.fd = -1; /* no check running anymore */
conn_xprt_close(conn);
if (conn->ctrl)
fd_delete(fd);
conn->t.sock.fd = -1; /* no check running anymore */
rv = 0;
if (global.spread_checks > 0) {
@ -1462,10 +1462,10 @@ static struct task *process_chk(struct task *t)
}
else
set_server_down(s);
conn->t.sock.fd = -1;
conn_xprt_close(conn);
if (conn->ctrl)
fd_delete(fd);
conn->t.sock.fd = -1;
rv = 0;
if (global.spread_checks > 0) {