]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: quic-be: QUIC server xprt already set when preparing their CTXs
authorFrederic Lecaille <flecaille@haproxy.com>
Mon, 18 Dec 2023 13:25:53 +0000 (14:25 +0100)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Wed, 11 Jun 2025 16:37:34 +0000 (18:37 +0200)
The QUIC servers xprts have already been set at server line parsing time.
This patch prevents the QUIC servers xprts to be reset to <ssl_sock> value which is
the value used for SSL/TCP connections.

src/ssl_sock.c

index c897bbf18efa9ea084e64a803ac9928ca3178451..1a953606e56711836eb5fbd518c6bcea99e8ff1a 100644 (file)
@@ -4398,7 +4398,9 @@ int ssl_sock_prepare_srv_ctx(struct server *srv)
                        return cfgerr;
                }
        }
-       if (srv->use_ssl == 1)
+
+       /* The QUIC server xprt has already been set. */
+       if (srv->use_ssl == 1 && !srv_is_quic(srv))
                srv->xprt = &ssl_sock;
 
        if (srv->ssl_ctx.client_crt) {