This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch 11-Dev
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit c9cffe46b6cce410dbe5679ff65b882c256627ab
Merge: 99499a05d6 4dc6bede9c
Author: bneradt <bner...@yahooinc.com>
AuthorDate: Wed May 15 13:25:41 2024 -0500

    Merge master branch into 11-Dev
    
    There were no conflicts.

 CMakeLists.txt                                     |  22 +-
 CMakePresets.json                                  |   8 +-
 NOTICE                                             |   5 +
 ci/asan_leak_suppression/regression.txt            |   3 +
 ci/rat-regex.txt                                   |   1 +
 include/iocore/net/UDPPacket.h                     |   6 +-
 include/proxy/http2/HTTP2.h                        |   1 +
 include/ts/{sdt.h => ats_probe.h}                  |   5 +-
 include/tscore/ink_config.h.cmake.in               |   1 +
 lib/CMakeLists.txt                                 |   3 +
 lib/swoc/unit_tests/test_TextView.cc               |   1 -
 lib/swoc/unit_tests/test_ip.cc                     |   1 -
 lib/systemtap/README.md                            |   4 +
 lib/systemtap/sys/sdt-config.h                     |  32 ++
 lib/systemtap/sys/sdt.h                            | 507 +++++++++++++++++++++
 .../magick/image_magic_dlopen_leak_suppression.txt |   1 +
 .../experimental/txn_box/plugin/src/ip_space.cc    |   1 +
 .../uri_signing/unit_tests/CMakeLists.txt          |   4 +
 .../uri_signing_test_leak_suppression.txt}         |   2 +-
 plugins/remap_stats/remap_stats.cc                 |   1 -
 .../image_magic_dlopen_leak_suppression.txt        |   3 +
 src/iocore/net/P_QUICPacketHandler.h               |   3 +-
 src/iocore/net/QUICNetVConnection.cc               |  10 +-
 src/iocore/net/QUICPacketHandler.cc                |   5 +-
 src/iocore/net/UnixUDPNet.cc                       | 123 ++++-
 src/proxy/CacheControl.cc                          |  24 +-
 src/proxy/ControlBase.cc                           |   6 +-
 src/proxy/FetchSM.cc                               |  42 +-
 src/proxy/HostStatus.cc                            |  49 +-
 src/proxy/ParentSelectionStrategy.cc               |  12 +-
 src/proxy/ProtocolProbeSessionAccept.cc            |  35 +-
 src/proxy/ReverseProxy.cc                          |  15 +-
 src/proxy/Transform.cc                             |  57 ++-
 src/proxy/hdrs/HTTP.cc                             |  28 +-
 src/proxy/hdrs/HdrHeap.cc                          |  12 +-
 src/proxy/hdrs/HdrToken.cc                         |  14 +-
 src/proxy/hdrs/MIME.cc                             |  67 +--
 src/proxy/hdrs/URL.cc                              |  55 ++-
 src/proxy/hdrs/XPACK.cc                            |  30 +-
 src/proxy/http/HttpSM.cc                           |  13 +-
 .../http/remap/unit-tests/test_RemapPlugin.cc      |   8 +-
 src/proxy/http2/HPACK.cc                           |  21 +-
 src/proxy/http2/HTTP2.cc                           |   3 +
 src/proxy/http2/Http2ClientSession.cc              |  16 +-
 src/proxy/http2/Http2CommonSession.cc              |  19 +-
 src/proxy/http2/Http2ConnectionState.cc            |  25 +-
 src/proxy/http2/Http2Frame.cc                      |  11 +-
 src/proxy/http2/Http2SessionAccept.cc              |  12 +-
 src/proxy/http3/Http09App.cc                       |  15 +-
 src/proxy/http3/Http3App.cc                        |  31 +-
 src/proxy/http3/Http3Frame.cc                      |   8 +-
 src/proxy/http3/Http3FrameCollector.cc             |   8 +-
 src/proxy/http3/Http3FrameDispatcher.cc            |  17 +-
 src/proxy/http3/Http3HeaderFramer.cc               |   8 +-
 src/proxy/http3/Http3HeaderVIOAdaptor.cc           |  19 +-
 src/proxy/http3/Http3SessionAccept.cc              |  18 +-
 src/proxy/http3/Http3SettingsHandler.cc            |  14 +-
 src/proxy/http3/Http3Transaction.cc                |  21 +-
 src/proxy/http3/QPACK.cc                           |  10 +-
 src/proxy/http3/test/test_Http3FrameDispatcher.cc  |   9 +
 src/proxy/logging/Log.cc                           |  63 +--
 src/proxy/logging/LogAccess.cc                     |  27 +-
 src/proxy/logging/LogBuffer.cc                     |  27 +-
 src/proxy/logging/LogConfig.cc                     |  50 +-
 src/proxy/logging/LogField.cc                      |  22 +-
 src/proxy/logging/LogFile.cc                       |  41 +-
 src/proxy/logging/LogFilter.cc                     |  19 +-
 src/proxy/logging/LogFormat.cc                     |  59 +--
 src/proxy/logging/LogObject.cc                     |  93 ++--
 src/proxy/logging/YamlLogConfig.cc                 |  11 +-
 .../logging/unit-tests/benchmark_LogObject.cc      |   2 +-
 src/tscore/CMakeLists.txt                          |   9 +-
 tests/gold_tests/ats_probe/ats_probe.bt            |  35 ++
 tests/gold_tests/ats_probe/ats_probe.replay.yaml   |  48 ++
 tests/gold_tests/ats_probe/ats_probe.test.py       | 112 +++++
 .../cache/replay/cache-range-response.replay.yaml  |  20 +
 tools/clang-format.sh                              |   2 +-
 77 files changed, 1673 insertions(+), 472 deletions(-)


Reply via email to