RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-06 01:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: session: small cleanup of conn_complete_session()

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2017-09-15 09:49:59 +02:00
parent 05f5047d40
commit eaa7e44ad7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/session.c
View File

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