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 2026/03/23 18:14:50 UTC
(trafficserver) branch 10.2.x updated (86d1721311 -> 80bef8a248)
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a change to branch 10.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
from 86d1721311 Adds Cache Groups concepts to Cripts (#12743)
new 3694109998 cmake: limit GENERAL_NAME bssl probe (#13008)
new 80bef8a248 autest: 1.10.4 -> 1.10.6 (#13002)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 35 ++++++++++++++++++++++-------------
tests/pyproject.toml | 5 ++---
2 files changed, 24 insertions(+), 16 deletions(-)
(trafficserver) 01/02: cmake: limit GENERAL_NAME bssl probe (#13008)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 3694109998d318984fa16233a2de702fe483ee87
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Fri Mar 20 18:15:46 2026 -0500
cmake: limit GENERAL_NAME bssl probe (#13008)
CMake can report HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE on plain
OpenSSL builds. In a build, the probe succeeded with
OpenSSL 3.x even though SSLLIB_IS_BORINGSSL and SSLLIB_IS_AWSLC were
both false. That made OCSP stapling in src/iocore/net/OCSPStapling.cc
take the bssl::GENERAL_NAME path, and the final traffic_server link
failed with an undefined reference to bssl::GENERAL_NAME_it().
The probe is not safe to run for non-BoringSSL libraries. OpenSSL 3.x
headers allow bssl::GENERAL_NAME_it() to be declared syntactically, but
libcrypto only exports the global GENERAL_NAME_it symbol, so a
compile-only try_compile can false-positive.
Only run the probe for BoringSSL-family builds and force the cache
entry off for plain OpenSSL builds.
(cherry picked from commit 33cb77a81e3275e665eabcadcb9f6cb2089e9452)
---
CMakeLists.txt | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5c51ca3af..80aa25460c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -593,19 +593,28 @@ check_cxx_source_compiles(
}"
HAVE_CRYPTO_EX_DUP_TYPE1
)
-check_cxx_source_compiles(
- "#include <openssl/asn1.h>
- namespace bssl {
- DECLARE_ASN1_ITEM(GENERAL_NAME)
- };
- int main() {
- if (&bssl::GENERAL_NAME_it == reinterpret_cast<void *>(0x01)) {
- return 1;
- }
- return 0;
- }"
- HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
-)
+if(SSLLIB_IS_BORINGSSL OR SSLLIB_IS_AWSLC)
+ check_cxx_source_compiles(
+ "#include <openssl/asn1.h>
+ namespace bssl {
+ DECLARE_ASN1_ITEM(GENERAL_NAME)
+ };
+ int main() {
+ if (&bssl::GENERAL_NAME_it == reinterpret_cast<void *>(0x01)) {
+ return 1;
+ }
+ return 0;
+ }"
+ HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
+ )
+else()
+ # This probe is only meaningful for BoringSSL-family libraries. Force it off
+ # for OpenSSL so a stale cache or macro shape change can't enable bssl:: code.
+ set(HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
+ FALSE
+ CACHE INTERNAL "GENERAL_NAME lives in the bssl namespace" FORCE
+ )
+endif()
set(CMAKE_EXTRA_INCLUDE_FILES netinet/in.h netinet/tcp.h)
check_type_size("struct tcp_info" STRUCT_TCP_INFO)
(trafficserver) 02/02: autest: 1.10.4 -> 1.10.6 (#13002)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 80bef8a248031d19792beeebf250c5314bf851f5
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Fri Mar 20 10:13:40 2026 -0500
autest: 1.10.4 -> 1.10.6 (#13002)
This should fix regex warnings we see with Python 3.14.
(cherry picked from commit c0cb4774218bfe8b657d81fe2ffc569136458c56)
---
tests/pyproject.toml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/pyproject.toml b/tests/pyproject.toml
index 4937dcd0d3..d055f938c7 100644
--- a/tests/pyproject.toml
+++ b/tests/pyproject.toml
@@ -18,11 +18,11 @@
name = "ats-autest"
version = "0.1.0"
description = "AuTest dependencies for Apache Traffic Server testing"
-requires-python = ">=3.6"
+requires-python = ">=3.11"
dependencies = [
# Keep init.cli.ext updated with this required autest version.
- "autest==1.10.4",
+ "autest==1.10.6",
# This should install TRLib, MicroServer, MicroDNS, Traffic-Replay.
"traffic-replay",
@@ -63,4 +63,3 @@ dev = [
]
-