cmcfarlen opened a new pull request, #13485:
URL: https://github.com/apache/trafficserver/pull/13485
Backport batch for the 10.2.0 release. All commits were cherry-picked with
`-x`
from master in `mergedAt` order, taken from the `ATS v10.2.x` project at
status
`For v10.2.0`.
Draft on purpose: this is here for the CI gate and lands by fast-forward, so
no
merge commit is created.
## Picked (16)
| PR | Title | Notes |
| --- | --- | --- |
| #13462 | Stabilize proxy protocol access log test | clean |
| #13444 | Raise HTTP/2 SETTINGS limits | clean |
| #13350 | Add tests for OpenSSL cert loading | clean |
| #13464 | TLS: Fix EVP_PKEY leak in SSLPrivateKeyHandler | clean |
| #13466 | Release logging thread continuations | clean |
| #13431 | Make log pipe test tolerate restricted kernels | clean |
| #13432 | healthchecks: reference count status file data | clean |
| #13469 | Rename `OPENSSL_IS_X` -> `OPENSSL_IS_AT_LEAST_X` | clean |
| #13468 | Enable OpenSSL QUIC when available | conflict resolved |
| #13438 | Fix exact URL cache config matching | conflict resolved |
| #13478 | Guard quiche-only QUIC connection state | clean |
| #13472 | Guard pre-init log wakeups | clean |
| #13470 | Fix some copy instead of move Coverity CIDs | **partial pick** |
| #13471 | Remove OpenSSL ENGINE code | clean |
| #13477 | ci-fedora-cxx20 preset: use clang | clean |
| #13397 | Make QUIC token secrets configurable | clean |
## Conflict resolutions
- **#13468** — 10.2.x's `ConfigContext::add_dependent_ctx()` takes one
argument;
master added a second (`ts::filename::SSL_MULTICERT`). Applied the
`HttpProxyPort::hasQUIC()` guard, kept the branch's one-argument form.
- **#13438** — auto-merge wanted to add `test_PluginYAML.cc` to
`src/proxy/unit_tests/CMakeLists.txt`; that file does not exist on 10.2.x.
Added
only `test_ControlMatcher.cc`, which is what the commit actually
introduces.
- **#13470** — partial. Omitted the hunks for `src/config/ssl_multicert.cc`,
`src/config/unit_tests/test_ssl_multicert.cc` and
`src/records/unit_tests/test_ReloadDirectives.cc` (files absent on
10.2.x), and
the `src/proxy/Plugin.cc` hunk, which depends on the master-only plugin
load
summary. With that hunk gone the `<utility>` include it added is unused, so
`Plugin.cc` is unchanged from the branch. The omissions are recorded in the
commit message.
## Not picked
- **#13186** (HTTP/3 support via OpenSSL 3.5) — cherry-pick is empty; already
present via #13463, whose files are byte-identical to master.
- **#13463** (10.2.x: HTTP/3 via OpenSSL QUIC) — already on the branch as
939915eeee; it was merged directly to 10.2.x.
- **#13465** (Add QMux support) — left at `For v10.2.0` pending an RM scope
decision; it is a ~1800-line new feature.
## Local verification
macOS arm64, `build-autest` (Debug). Build clean, and `ctest` 162/162 pass.
`test_jsonrpcserver` is excluded from that count: it fails intermittently,
but it
also fails on unmodified `upstream/10.2.x` under `--repeat until-fail:5`, so
it is
pre-existing macOS-local flakiness (unix-socket connect timing) and not
caused by
these picks. Linux CI is the arbiter.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
