cmcfarlen opened a new pull request, #13709:
URL: https://github.com/apache/trafficserver/pull/13709

   Cherry-picks for the 10.2.1 release, taken from the `For v10.2.1` column of 
the
   [ATS v10.2.x project](https://github.com/orgs/apache/projects/573).
   
   Draft on purpose: this exists to run the full CI matrix over the picked set. 
It
   lands by fast-forward, not by merging here.
   
   | # | PR | Notes |
   |---|----|-------|
   | 1 | #13514 | Share HTTP accept properties |
   | 2 | #13645 | Cleanup LogField Registration |
   | 3 | #13063 | Add changelog generation tool for GitHub milestones |
   | 4 | #13574 | Fix TransformVConnection leak in abort_tunnel() |
   | 5 | #13450 | h2origin autest: honor the 30s squid.log wait budget |
   | 6 | #13355 | hrw4u: add `--version` CLI flag |
   | 7 | #13672 | header_rewrite: guard the `i == 0` case in HRWSimpleTokenizer 
|
   | 8 | #13673 | Fix build errors with LLVM 23 |
   | 9 | #13616 | Allow a metric to be unlisted |
   | 10 | #13697 | Fix strncasecmp checks that accepted a prefix as equal |
   | 11 | #13666 | Retract per server metrics when the mode changes |
   | 12 | #13700 | Fix the 9.2 compatibility cache key for paths that carry 
`;params` |
   | 13 | #13696 | hrw4u: admit SESSION_VARS as a denyable section |
   | 14 | #13611 | Make the 9.2 compatibility cache key usable end to end |
   
   Picked in master merge order. Every commit carries a `cherry picked from 
commit`
   trailer.
   
   ## Conflict resolutions
   
   Four picks needed hands. In each case the release branch's own idiom was 
kept and
   only the upstream fix applied.
   
   **#13514 — `HttpProxyServerMain.cc`.** 10.2.x guards probe-acceptor 
construction
   with `needs_probe` (master does not). Kept the guard, applied the `&port` 
argument
   change inside it.
   
   **#13645 — `Log.cc`.** Master changed the `sshv` and `csshv` log fields from
   `dINT` to `STRING` in a commit that is *not* on 10.2.x, and the auto-merge 
dragged
   that behaviour change in. Kept 10.2.x's `dINT` and took only the
   `register_field()` refactor. Verified mechanically: all 138 `(symbol, name, 
type)`
   registrations are byte-identical to the pre-pick branch, so this commit is a 
pure
   refactor here, as intended.
   
   **#13666 — `test_ConnectionTracker.cc`.** The file was added to master by 
#13516
   (not picked), so 10.2.x has neither the file nor its `CMakeLists.txt` entry.
   Kept the helpers and the `ConnectionTracker aggregate metric publication` 
test
   case that #13666 actually contributes, and added the one build-wiring line 
so it
   runs. Dropped #13516's `Connection tracker server match conversion` test 
case:
   its "invalid values are clamped" section asserts clamping that 10.2.x's
   `SERVER_MATCH_CONV.store_int` deliberately does not do (the clamp is 
commented
   out there), so importing it would have failed the build's test suite.
   
   **#13700 — `URL.cc` / `test_URL.cc` / `ink_ascii_tolower.h`.** The header 
comes
   from #13320 (Highway-accelerated ASCII to_lower, not picked) and #13700 only
   touches its comment, so it was dropped. 10.2.x keeps a local `memcpy_tolower`
   helper where master includes that header — kept the helper, took the new 
comment.
   Four SIMD-oriented uppercase-host fixtures in `test_URL.cc` are likewise 
#13320's,
   not this commit's, so they were left out. #13700's own `;params` equivalence 
tests
   are all present.
   
   ## Not picked
   
   Three project items at `For v10.2.1` are still **open** on master and so were
   skipped: #12825 (hrw4u native C++ parser), #13086 (per-thread FD tables),
   #13196 (CompileParseRules refactor).
   
   ## Verification
   
   Per-commit file sets were diffed against their master counterparts; the only 
two
   that differ are #13666 (+ the CMakeLists wiring line) and #13700 (− the 
dropped
   header), both as described above.
   
   Local build could not run — the host's Xcode license prompt is blocking the
   toolchain — so CI here is the first real compile of this set.
   


-- 
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]

Reply via email to