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:
402dbc1
)
MINOR: session: use conn_full_close() instead of conn_force_close()
author
Willy Tarreau
<w@1wt.eu>
Thu, 5 Oct 2017 16:12:51 +0000
(18:12 +0200)
committer
Willy Tarreau
<w@1wt.eu>
Sun, 22 Oct 2017 07:54:17 +0000
(09:54 +0200)
We simply disable tracking before calling it.
src/session.c
patch
|
blob
|
history
diff --git
a/src/session.c
b/src/session.c
index
e5167c9
..
bc0b6d6
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-264,7
+264,7
@@
int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr
out_free_sess:
session_free(sess);
out_free_conn:
- cli_conn->flags &= ~CO_FL_XPRT_TRACKED;
+ conn_stop_tracking(cli_conn);
conn_xprt_close(cli_conn);
conn_free(cli_conn);
out_close:
@@
-358,7
+358,8
@@
static void session_kill_embryonic(struct session *sess)
}
/* kill the connection now */
- conn_force_close(conn);
+ conn_stop_tracking(conn);
+ conn_full_close(conn);
conn_free(conn);
listener_release(sess->listener);