]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: connections: Don't try to send early data if we have no mux.
authorOlivier Houchard <cognet@ci0.org>
Fri, 14 Jun 2019 22:14:05 +0000 (00:14 +0200)
committerOlivier Houchard <cognet@ci0.org>
Sat, 15 Jun 2019 09:35:00 +0000 (11:35 +0200)
In connect_server(), if we don't yet have a mux, because we're choosing
one depending on the ALPN, don't attempt to send early data. We can't do
it because those data would depend on the mux, that will only be determined
by the handshake.

This should be backported to 1.9.

src/backend.c

index 809a323e7fada63d1074e1f879155fb87e3b059f..bff71aba40e1c5ad3ca2f40a294597a688f653fb 100644 (file)
@@ -1605,7 +1605,7 @@ int connect_server(struct stream *s)
 
 #if USE_OPENSSL && (defined(OPENSSL_IS_BORINGSSL) || (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L))
 
-       if (!reuse && cli_conn && srv &&
+       if (!reuse && cli_conn && srv && srv_conn->mux &&
            (srv->ssl_ctx.options & SRV_SSL_O_EARLY_DATA) &&
            /* Only attempt to use early data if either the client sent
             * early data, so that we know it can handle a 425, or if