You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by cm...@apache.org on 2024/07/21 22:36:38 UTC
(trafficserver) 16/16: Set `TS_HAVE_TLS_EARLY_DATA` correctly (#11577)
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit aa4ec84190a52171a4ae1ea3fa0f2faa9a14f8dd
Author: JosiahWI <41...@users.noreply.github.com>
AuthorDate: Thu Jul 18 17:01:09 2024 -0500
Set `TS_HAVE_TLS_EARLY_DATA` correctly (#11577)
I chose a conditional over a generator expression because the community is
likely more familiar with the conditional, and the generator expressions can
look kind of messy.
Fixes #11575.
(cherry picked from commit 59404ee1cffda817cb11e4ee81eb0e5344b939a2)
---
CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0069e1b68f..8155afe9d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -485,15 +485,15 @@ endif()
unset(CMAKE_REQUIRED_FLAGS)
-set(TS_HAS_TLS_EARLY_DATA
- ${HAVE_SSL_SET_MAX_EARLY_DATA}
- |
- ${HAVE_SSL_READ_EARLY_DATA}
- |
- ${HAVE_SSL_WRITE_EARLY_DATA}
- |
- ${HAVE_SSL_IN_EARLY_DATA}
+if(HAVE_SSL_SET_MAX_EARLY_DATA
+ OR HAVE_SSL_READ_EARL_DATA
+ OR HAVE_SSL_WRITE_EARLY_DATA
+ OR HAVE_SSL_IN_EARLY_DATA
)
+ set(TS_HAS_TLS_EARLY_DATA TRUE)
+else()
+ set(TS_HAS_TLS_EARLY_DATA FALSE)
+endif()
set(CMAKE_REQUIRED_INCLUDES netinet/in.h netinet/tcp.h)
check_type_size("struct tcp_info" STRUCT_TCP_INFO)