projects
/
haproxy-3.0.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9ce57e
)
MINOR: connection: ensure conn_ctrl_close() also resets the fd
author
Willy Tarreau
<w@1wt.eu>
Thu, 5 Oct 2017 15:43:39 +0000
(17:43 +0200)
committer
Willy Tarreau
<w@1wt.eu>
Sun, 22 Oct 2017 07:54:16 +0000
(09:54 +0200)
The connection's fd was reset to DEAD_FD_MAGIC on conn_force_close()
but not on conn_full_close(), which is a bit strange. Let's do it on
both.
include/proto/connection.h
patch
|
blob
|
history
diff --git
a/include/proto/connection.h
b/include/proto/connection.h
index
defdefe
..
dd19714
100644
(file)
--- a/
include/proto/connection.h
+++ b/
include/proto/connection.h
@@
-125,6
+125,7
@@
static inline void conn_ctrl_close(struct connection *conn)
{
if ((conn->flags & (CO_FL_XPRT_READY|CO_FL_CTRL_READY)) == CO_FL_CTRL_READY) {
fd_delete(conn->handle.fd);
+ conn->handle.fd = DEAD_FD_MAGIC;
conn->flags &= ~CO_FL_CTRL_READY;
}
}