mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 17:17:06 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Olivier Houchard 2019-06-15 00:13:15 +02:00
parent 76c83826db
commit b4a8b2c63d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend.c
View File

@ -1501,7 +1501,7 @@ int connect_server(struct stream *s)
#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation) #if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
if (!srv || if (!srv ||
((!(srv->ssl_ctx.alpn_str) && !(srv->ssl_ctx.npn_str)) || ((!(srv->ssl_ctx.alpn_str) && !(srv->ssl_ctx.npn_str)) ||
srv->mux_proto)) srv->mux_proto || s->be->mode != PR_MODE_HTTP))
#endif #endif
{ {
srv_cs = objt_cs(s->si[1].end); srv_cs = objt_cs(s->si[1].end);