]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: ssl: Remove dead code.
authorOlivier Houchard <cognet@ci0.org>
Fri, 24 Jan 2020 14:13:57 +0000 (15:13 +0100)
committerOlivier Houchard <cognet@ci0.org>
Fri, 24 Jan 2020 14:13:57 +0000 (15:13 +0100)
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.

src/ssl_sock.c

index e42f071250f9c81acc836f4666a177d76d3b0aaa..5ca59eb4786301c35db4f49fc94f62909d323111 100644 (file)
@@ -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 */