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 a96362a9976c5167fc39454709f07279bf7ed922
Merge: 0cc15e0d3d 1c4825ddbf
Author: bneradt <[email protected]>
AuthorDate: Fri Mar 8 13:11:32 2024 -0500

    Merge remote-tracking branch 'upstream/master' into 11-Dev
    
    Conflicts:
          CMakeLists.txt

 CMakeLists.txt                                     |   10 +-
 CMakePresets.json                                  |    8 +-
 README.md                                          |   13 +-
 cmake/add_atsplugin.cmake                          |    9 +-
 doc/CMakeLists.txt                                 |    2 +
 doc/admin-guide/files/records.yaml.en.rst          |    6 +
 doc/admin-guide/plugins/combo_handler.en.rst       |    9 +-
 doc/admin-guide/plugins/header_freq.en.rst         |    7 +-
 doc/admin-guide/plugins/header_rewrite.en.rst      |    3 +-
 doc/admin-guide/plugins/icap.en.rst                |    8 +-
 doc/admin-guide/plugins/index.en.rst               |    5 +-
 doc/admin-guide/plugins/regex_revalidate.en.rst    |    5 +-
 doc/admin-guide/plugins/stek_share.en.rst          |    5 +-
 doc/admin-guide/plugins/url_sig.en.rst             |   11 +-
 doc/admin-guide/plugins/wasm.en.rst                |   14 +-
 ....rst => TSContScheduleEveryOnEntirePool.en.rst} |   27 +-
 .../api/functions/TSContScheduleEveryOnPool.en.rst |   10 +-
 ...l.en.rst => TSContScheduleEveryOnThread.en.rst} |   18 +-
 ...ol.en.rst => TSContScheduleOnEntirePool.en.rst} |   24 +-
 .../api/functions/TSContScheduleOnPool.en.rst      |   47 +-
 .../api/functions/TSContScheduleOnThread.en.rst    |    5 +-
 .../plugins/example-plugins/index.en.rst           |    6 +-
 doc/static/languages.json                          |    2 +
 example/CMakeLists.txt                             |    2 +
 example/cripts/CMakeLists.txt                      |    1 +
 include/cripts/Crypto.hpp                          |    6 +-
 include/cripts/Headers.hpp                         |    6 +-
 include/cripts/Lulu.hpp                            |   12 +-
 include/cripts/Metrics.hpp                         |    4 +-
 include/cripts/Time.hpp                            |    2 +-
 include/cripts/Urls.hpp                            |   14 +-
 include/iocore/eventsystem/EventProcessor.h        |    3 +
 include/iocore/eventsystem/Lock.h                  |    6 +-
 include/proxy/hdrs/XPACK.h                         |    5 +
 include/proxy/http/remap/UrlRewrite.h              |    2 +-
 include/proxy/http2/Http2CommonSession.h           |   10 +-
 include/proxy/http2/Http2ConnectionState.h         |    6 +-
 include/proxy/http2/Http2Stream.h                  |    4 +-
 include/proxy/http3/Http3Transaction.h             |    2 +-
 include/ts/ts.h                                    |    3 +
 include/tscore/Encoding.h                          |    4 +-
 include/tscore/FrequencyCounter.h                  |    2 +-
 include/tsutil/Regex.h                             |  106 +-
 lib/swoc/CMakeLists.txt                            |    4 +
 lib/swoc/include/swoc/IntrusiveHashMap.h           |    9 +
 lib/swoc/include/swoc/TextView.h                   |    2 +-
 lib/swoc/unit_tests/CMakeLists.txt                 |   51 +
 lib/swoc/unit_tests/ex_IntrusiveDList.cc           |  215 ++
 lib/swoc/unit_tests/ex_Lexicon.cc                  |  130 ++
 lib/swoc/unit_tests/ex_MemArena.cc                 |  224 ++
 lib/swoc/unit_tests/ex_TextView.cc                 |  319 +++
 lib/swoc/unit_tests/ex_UnitParser.cc               |  183 ++
 lib/swoc/unit_tests/ex_bw_format.cc                |  691 +++++++
 lib/swoc/unit_tests/ex_ipspace_properties.cc       |  639 ++++++
 lib/swoc/unit_tests/examples/resolver.txt          |   21 +
 lib/swoc/unit_tests/test_BufferWriter.cc           |  506 +++++
 lib/swoc/unit_tests/test_Errata.cc                 |  430 ++++
 lib/swoc/unit_tests/test_IntrusiveDList.cc         |  272 +++
 lib/swoc/unit_tests/test_IntrusiveHashMap.cc       |  274 +++
 lib/swoc/unit_tests/test_Lexicon.cc                |  276 +++
 lib/swoc/unit_tests/test_MemArena.cc               |  663 ++++++
 lib/swoc/unit_tests/test_MemSpan.cc                |  310 +++
 lib/swoc/unit_tests/test_Scalar.cc                 |  257 +++
 lib/swoc/unit_tests/test_TextView.cc               |  651 ++++++
 lib/swoc/unit_tests/test_Vectray.cc                |   82 +
 lib/swoc/unit_tests/test_bw_format.cc              |  694 +++++++
 lib/swoc/unit_tests/test_ip.cc                     | 2187 ++++++++++++++++++++
 lib/swoc/unit_tests/test_meta.cc                   |  119 ++
 lib/swoc/unit_tests/test_range.cc                  |   39 +
 lib/swoc/unit_tests/test_swoc_file.cc              |  341 +++
 lib/swoc/unit_tests/unit_test_main.cc              |   39 +
 lib/swoc/unit_tests/unit_tests.part                |   42 +
 plugins/experimental/maxmind_acl/CMakeLists.txt    |    2 +-
 plugins/experimental/rate_limit/limiter.h          |   14 +-
 plugins/experimental/tls_bridge/CMakeLists.txt     |    2 +-
 .../txn_box/plugin/include/txn_box/accl_util.h     |    4 +-
 .../experimental/txn_box/unit_tests/CMakeLists.txt |    2 -
 src/api/CMakeLists.txt                             |    6 -
 src/api/InkAPI.cc                                  |   90 +-
 src/cripts/CMakeLists.txt                          |    2 +-
 src/cripts/Lulu.cc                                 |    6 +
 src/iocore/eventsystem/P_UnixEventProcessor.h      |   46 +
 src/iocore/eventsystem/UnixEThread.cc              |    8 +-
 src/iocore/hostdb/HostDB.cc                        |   26 +-
 src/iocore/hostdb/P_HostDBProcessor.h              |    3 -
 src/iocore/net/EventIO.cc                          |   12 +-
 src/iocore/net/P_SSLConfig.h                       |    1 +
 src/iocore/net/SSLConfig.cc                        |   12 +-
 src/iocore/net/UnixNetVConnection.cc               |    6 +
 src/mgmt/rpc/handlers/common/RecordsUtils.cc       |   13 +
 src/proxy/hdrs/XPACK.cc                            |   32 +-
 src/proxy/hdrs/unit_tests/test_XPACK.cc            |   13 +
 src/proxy/http/HttpSM.cc                           |   13 +-
 src/proxy/http/HttpSessionManager.cc               |  138 +-
 src/proxy/http/HttpTunnel.cc                       |   13 +-
 src/proxy/http/remap/UrlRewrite.cc                 |   14 +-
 src/proxy/http2/Http2ConnectionState.cc            |   42 +-
 src/proxy/http2/Http2Stream.cc                     |    2 +-
 src/proxy/http3/Http3Session.cc                    |    2 +-
 src/proxy/http3/Http3Transaction.cc                |    8 +-
 src/proxy/http3/QPACK.cc                           |   11 +-
 src/records/RecCore.cc                             |   28 +-
 src/records/RecordsConfig.cc                       |    2 +
 src/tscore/Encoding.cc                             |    3 +
 src/tsutil/CMakeLists.txt                          |   17 +-
 src/tsutil/Regex.cc                                |  329 ++-
 src/tsutil/unit_tests/test_Regex.cc                |  138 +-
 .../chunked_encoding/bad_chunked_encoding.test.py  |   17 +-
 .../replays/malformed_chunked_header.replay.yaml   |   49 +-
 tests/gold_tests/cont_schedule/entire_pool.py      |   57 +
 .../gold/schedule_every_on_entire_pool.gold        |   33 +
 .../cont_schedule/gold/schedule_every_on_pool.gold |    7 +
 .../gold/schedule_every_on_thread.gold             |    8 +
 .../gold/schedule_on_entire_pool.gold              |   33 +
 .../schedule_every_on_entire_pool.test.py          |   64 +
 .../cont_schedule/schedule_every_on_pool.test.py   |   62 +
 .../cont_schedule/schedule_every_on_thread.test.py |   62 +
 .../cont_schedule/schedule_on_entire_pool.test.py  |   64 +
 tests/gold_tests/h2/gold/httpbin_2_stdout.gold     |    2 +-
 tests/gold_tests/h2/gold/priority_0_stdout.gold    |    2 +-
 tests/gold_tests/h2/grpc/grpc.test.py              |   25 +-
 tests/gold_tests/h2/grpc/grpc_client.py            |   61 +-
 tests/gold_tests/h2/grpc/grpc_server.py            |   54 +-
 tests/gold_tests/h2/grpc/simple.proto              |    6 +-
 tests/gold_tests/h2/http2_priority.test.py         |    4 +-
 tests/gold_tests/h2/httpbin.test.py                |    4 +-
 tests/gold_tests/ip_allow/ip_category.test.py      |    6 +-
 .../pluginTest/TSVConnFd/TSVConnFd.test.py         |    4 +-
 tests/gold_tests/records/gold/full_records.yaml    |    1 +
 .../records/legacy_config/full_records.config      |    1 +
 tests/gold_tests/remap/remap_acl.test.py           |    2 +-
 .../gold_tests/tls/exit_on_cert_load_fail.test.py  |  119 ++
 tests/gold_tests/tls/ssl_multicert_loader.test.py  |    4 +-
 tests/tools/plugins/cont_schedule.cc               |  188 +-
 134 files changed, 11570 insertions(+), 553 deletions(-)


Reply via email to