From: Willy Tarreau <w@1wt.eu>
Date: Fri, 15 Sep 2017 07:49:59 +0000 (+0200)
Subject: MINOR: session: small cleanup of conn_complete_session()
X-Git-Tag: v1.8-dev3~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa7e44ad749f0ff689f4cf07f762abcf20d1d6c;p=thirdparty%2Fhaproxy.git

MINOR: session: small cleanup of conn_complete_session()

Commit 8e3c6ce ("MEDIUM: connection: get rid of data->init() which was
not for data") simplified conn_complete_session() but introduced a
confusing check which cannot happen on CO_FL_HANDSHAKE. Make it clear
that this call is final and will either succeed and complete the
session or fail.
---

diff --git a/src/session.c b/src/session.c
index 22f6b58b4b..c4c929450b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -404,14 +404,12 @@ static int conn_complete_session(struct connection *conn)
 {
 	struct session *sess = conn->owner;
 
+	/* the embryonic session's task is not needed anymore */
 	conn_clear_xprt_done_cb(conn);
 
 	if (conn->flags & CO_FL_ERROR)
 		goto fail;
 
-	if (conn->flags & CO_FL_HANDSHAKE)
-		return 0; /* wait more */
-
 	/* if logs require transport layer information, note it on the connection */
 	if (sess->fe->to_log & LW_XPRT)
 		conn->flags |= CO_FL_XPRT_TRACKED;