]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: connections: Don't use ALPN to pick mux when in mode TCP.
authorOlivier Houchard <cognet@ci0.org>
Fri, 14 Jun 2019 22:13:15 +0000 (00:13 +0200)
committerOlivier Houchard <cognet@ci0.org>
Sat, 15 Jun 2019 09:34:55 +0000 (11:34 +0200)
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.

src/backend.c

index 36936a5209250458f9af1a3c05d37731564b9ea3..809a323e7fada63d1074e1f879155fb87e3b059f 100644 (file)
@@ -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);