Skip to content

10.1.x: cherry-picks for the 10.1.5 release #13678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cmcfarlen wants to merge 15 commits into
base: 10.1.x
Choose a base branch
from
+1,277 −343
Draft

10.1.x: cherry-picks for the 10.1.5 release #13678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bd81037
slice_prefetch.test.py: address cache.log flakiness (#13322)
bneradt Jun 25, 2026
790d2e4
Expand client IP debug logging test coverage (#13290)
bneradt Jun 27, 2026
e1b6f1b
autest: skip async handshake test when plugin is absent (#13372)
maskit Jul 13, 2026
f3b13ec
stale_response.test.py: address log wait flakiness (#13323)
bneradt Jul 13, 2026
67e38ce
Handle webp_transform input robustly (#13390)
bneradt Jul 17, 2026
a0a7908
Preserve client port in transaction logs (#13379)
bneradt Jul 20, 2026
e9b666a
Fix Fedora OTEL and WAMR builds (#13423)
bneradt Jul 29, 2026
b9bd7b9
healthchecks: reference count status file data (#13432)
bneradt Jul 31, 2026
59d10d5
Cache empty chunked responses (#13410)
bneradt Aug 4, 2026
b1d9e58
Proxy Verifier v3.2.0 (#13642)
bneradt Sep 4, 2026
df0c2e6
dns: fix remaining-space tracking when copying address records (#13558)
dxbjavid Sep 4, 2026
82d4b4c
Fix Clang 21 analyzer findings (#13593)
bneradt Aug 27, 2026
f93d952
Clean up Clang analyzer warnings (#12226)
hnakamur May 12, 2025
7fb5ab1
Restore Clang analyzer checks on 10.1.x
Sep 15, 2026
d99b11a
autest: make the await-file-contains helper safe for regex needles
cmcfarlen Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ else()
endif()
check_openssl_is_quictls(SSLLIB_IS_QUICTLS "${OPENSSL_INCLUDE_DIR}")

if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0")
if(NOT SSLLIB_IS_BORINGSSL
AND NOT SSLLIB_IS_AWSLC
AND OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0"
)
set(SSLLIB_IS_OPENSSL3 TRUE)
add_compile_definitions(OPENSSL_API_COMPAT=10002 OPENSSL_IS_OPENSSL3)
endif()
Expand Down
14 changes: 10 additions & 4 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,12 @@
"inherits": ["ci"],
"cacheVariables": {
"ENABLE_PROBES": "ON",
"OPENSSL_ROOT_DIR": "/opt/openssl-quic",
"OPENSSL_ROOT_DIR": "/usr",
"opentelemetry_ROOT": "/opt",
"CURL_ROOT": "/opt",
"CURL_ROOT": "/usr",
"wamr_ROOT": "/opt",
"ENABLE_OTEL_TRACER": "ON",
"ENABLE_WASM_WAMR": "ON",
"ENABLE_CRIPTS": "ON"
}
},
Expand All @@ -201,15 +203,17 @@
"OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl",
"quiche_ROOT": "/opt/h3-tools-boringssl/quiche",
"opentelemetry_ROOT": "/opt",
"CURL_ROOT": "/opt",
"CURL_ROOT": "/opt/h3-tools-boringssl",
"wamr_ROOT": "/opt",
"ENABLE_OTEL_TRACER": "ON",
"ENABLE_WASM_WAMR": "ON",
"CMAKE_INSTALL_PREFIX": "/tmp/ats-quiche",
"ENABLE_QUICHE": "ON"
}
},
{
"name": "ci-fedora-autest",
"displayName": "CI Fedora Quiche Autest",
"displayName": "CI Fedora Autest",
"description": "CI Pipeline config for Fedora Linux (autest build)",
"inherits": ["ci-fedora", "autest"]
},
Expand Down Expand Up @@ -250,6 +254,8 @@
"description": "CI Pipeline config for running clang-analyzer",
"inherits": ["ci"],
"cacheVariables": {
"CMAKE_C_COMPILER": "clang",
"CMAKE_CXX_COMPILER": "clang++",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"ENABLE_CCACHE": "OFF",
"ENABLE_EXAMPLE": "OFF",
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/memcache/tsmemcache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ MC::add_binary_header(uint16_t err, uint8_t hdr_len, uint16_t key_len, uint32_t
int
MC::write_binary_error(protocol_binary_response_status err, int swallow)
{
const char *errstr = "Unknown error";
const char *errstr{nullptr};
switch (err) {
case PROTOCOL_BINARY_RESPONSE_ENOMEM:
errstr = "Out of memory";
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/wasm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if(wasmedge_FOUND)
list(APPEND WASM_RUNTIME wasmedge::wasmedge)
endif()

target_link_libraries(wasm PRIVATE ${WASM_RUNTIME})
target_link_libraries(wasm PRIVATE OpenSSL::SSL ${WASM_RUNTIME})

if(wamr_FOUND)
target_compile_options(wasm PRIVATE -DWAMR)
Expand Down
1 change: 1 addition & 0 deletions plugins/experimental/wasm/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ endif()

add_library(wasmlib STATIC ${CC_FILES})
target_compile_options(wasmlib PUBLIC -Wno-unused-parameter)
target_link_libraries(wasmlib PRIVATE OpenSSL::Crypto)
if(wamr_FOUND)
target_compile_options(wasmlib PRIVATE -Wno-missing-field-initializers)
target_link_libraries(wasmlib PUBLIC wamr::wamr)
Expand Down
Loading