From: Frederic Lecaille <flecaille@haproxy.com>
Date: Mon, 18 Dec 2023 13:25:53 +0000 (+0100)
Subject: MINOR: quic-be: QUIC server xprt already set when preparing their CTXs
X-Git-Tag: v3.3-dev2~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4e12962086157aa0eb95fb014c5fc76f04f8e95;p=thirdparty%2Fhaproxy.git

MINOR: quic-be: QUIC server xprt already set when preparing their CTXs

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.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index c897bbf18..1a953606e 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -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) {