projects
/
haproxy-2.1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc42acd
)
MINOR: tcp: use conn_full_close() instead of conn_force_close()
author
Willy Tarreau
<w@1wt.eu>
Thu, 5 Oct 2017 16:01:29 +0000
(18:01 +0200)
committer
Willy Tarreau
<w@1wt.eu>
Sun, 22 Oct 2017 07:54:16 +0000
(09:54 +0200)
There's no point in using conn_force_close() in outgoing connect()
since XPRT_TRACKED is not set so both functions are equivalent.
src/proto_tcp.c
patch
|
blob
|
history
diff --git
a/src/proto_tcp.c
b/src/proto_tcp.c
index
ff800c8
..
e4e6483
100644
(file)
--- a/
src/proto_tcp.c
+++ b/
src/proto_tcp.c
@@
-545,7
+545,7
@@
int tcp_connect_server(struct connection *conn, int data, int delack)
fdtab[fd].linger_risk = 1; /* close hard if needed */
if (conn_xprt_init(conn) < 0) {
- conn_force_close(conn);
+ conn_full_close(conn);
conn->flags |= CO_FL_ERROR;
return SF_ERR_RESOURCE;
}