From: Willy Tarreau <w@1wt.eu>
Date: Thu, 5 Oct 2017 16:12:51 +0000 (+0200)
Subject: MINOR: session: use conn_full_close() instead of conn_force_close()
X-Git-Tag: v1.8-dev3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b78a9dd0467d6c158e444b9e3989396609ee328;p=thirdparty%2Fhaproxy.git

MINOR: session: use conn_full_close() instead of conn_force_close()

We simply disable tracking before calling it.
---

diff --git a/src/session.c b/src/session.c
index e5167c98b8..bc0b6d6431 100644
--- 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);