From eaa7e44ad749f0ff689f4cf07f762abcf20d1d6c Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 15 Sep 2017 09:49:59 +0200 Subject: [PATCH] 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. --- src/session.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/session.c b/src/session.c index 22f6b58b4..c4c929450 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; -- 2.47.3