From: Olivier Houchard <cognet@ci0.org>
Date: Fri, 14 Jun 2019 22:13:15 +0000 (+0200)
Subject: BUG/MEDIUM: connections: Don't use ALPN to pick mux when in mode TCP.
X-Git-Tag: v2.0.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4a8b2c63d51f7ff99e5b10c52cad938105f1fde;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: connections: Don't use ALPN to pick mux when in mode TCP.

In connect_server(), don't wait until we negociate the ALPN to choose the
mux, the only mux we want to use is the mux_pt anyway.

This should be backported to 1.9.
---

diff --git a/src/backend.c b/src/backend.c
index 36936a5209..809a323e7f 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1501,7 +1501,7 @@ int connect_server(struct stream *s)
 #if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
 		if (!srv ||
 		    ((!(srv->ssl_ctx.alpn_str) && !(srv->ssl_ctx.npn_str)) ||
-		    srv->mux_proto))
+		    srv->mux_proto || s->be->mode != PR_MODE_HTTP))
 #endif
 		{
 			srv_cs = objt_cs(s->si[1].end);