From: Willy Tarreau <w@1wt.eu>
Date: Thu, 7 Aug 2025 15:06:45 +0000 (+0200)
Subject: CLEANUP: backend: simplify the complex ifdef related to 0RTT in connect_server()
X-Git-Tag: v3.3-dev9~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b9d0720e10a4407a0ceb3116f47493bc4d03381;p=thirdparty%2Fhaproxy.git

CLEANUP: backend: simplify the complex ifdef related to 0RTT in connect_server()

Since 3.0 we have HAVE_SSL_0RTT precisely to avoid checking horribly
complicated and unmaintainable conditions to detect support for 0RTT.
Let's just drop the complex condition and use the macro instead.
---

diff --git a/src/backend.c b/src/backend.c
index 5e757ae76..1605e766a 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -2164,8 +2164,7 @@ int connect_server(struct stream *s)
 		}
 	}
 
-#if defined(USE_OPENSSL) && (defined(OPENSSL_IS_BORINGSSL) || (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L))
-
+#if defined(HAVE_SSL_0RTT)
 	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