From: Olivier Houchard <cognet@ci0.org>
Date: Fri, 24 Jan 2020 14:13:57 +0000 (+0100)
Subject: MINOR: ssl: Remove dead code.
X-Git-Tag: v2.2-dev2~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d53cd6978d80aea86a5ca05aa023a1c6640d606;p=thirdparty%2Fhaproxy.git

MINOR: ssl: Remove dead code.

Now that we don't call the handshake function directly, but merely wake
the tasklet, we can no longer have CO_FL_ERR, so don't bother checking it.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index e42f071250..5ca59eb478 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5981,8 +5981,6 @@ static int ssl_sock_init(struct connection *conn, void **xprt_ctx)
 		*xprt_ctx = ctx;
 		/* Start the handshake */
 		tasklet_wakeup(ctx->wait_event.tasklet);
-		if (conn->flags & CO_FL_ERROR)
-			goto err;
 		return 0;
 	}
 	else if (objt_listener(conn->target)) {
@@ -6048,8 +6046,6 @@ static int ssl_sock_init(struct connection *conn, void **xprt_ctx)
 		*xprt_ctx = ctx;
 		/* Start the handshake */
 		tasklet_wakeup(ctx->wait_event.tasklet);
-		if (conn->flags & CO_FL_ERROR)
-			goto err;
 		return 0;
 	}
 	/* don't know how to handle such a target */