From: Olivier Houchard <ohouchard@haproxy.com>
Date: Thu, 29 Nov 2018 15:58:49 +0000 (+0100)
Subject: BUG/MEDIUM: connections: Don't forget to detach the connection from the SI.
X-Git-Tag: v1.9-dev9~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d76bd2d40bc26d9cb7300afb2e462c578733dcd1;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: connections: Don't forget to detach the connection from the SI.

When we're deferring the mux choice until the ALPN is negociated, we
attach the connection to the stream_interface until it's done, so that we
can destroy it if something goes wrong and the stream is destroy.
Before calling si_attach_cs() to attach the conn_stream once we have it,
call si_detach_endpoint(), or is_attach_cs() would destroy the connection.
---

diff --git a/src/backend.c b/src/backend.c
index 29a21dab61..7a2168acc8 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1056,6 +1056,7 @@ static int conn_complete_server(struct connection *conn)
 		goto fail;
 	if (conn->flags & CO_FL_ERROR)
 		goto fail;
+	si_detach_endpoint(&s->si[1]);
 	cs = si_alloc_cs(&s->si[1], conn);
 	if (!cs)
 		goto fail;