This is an automated email from the ASF dual-hosted git repository. shinrich pushed a commit to branch aviatrix-integrate-ats10 in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 05b7e30583ba365afbfe85663e39331a8289f55e Merge: 6d70defc2f 7eac946a2f Author: Susan Hinrichs <[email protected]> AuthorDate: Wed Aug 30 20:46:30 2023 +0000 Merge branch 'allow-plain' into add-tunnel-transform CMakeLists.txt | 25 +-- configure.ac | 29 ---- doc/admin-guide/files/records.yaml.en.rst | 7 + .../testing/blackbox-testing.en.rst | 5 - example/plugins/c-api/cache_scan/cache_scan.cc | 14 +- example/plugins/c-api/remap/remap.cc | 5 +- include/records/I_RecDefs.h | 1 + include/records/I_RecHttp.h | 3 + include/ts/DbgCtl.h | 120 ++++++++++++++ include/ts/Makefile.am | 4 +- include/ts/apidefs.h.in | 5 - include/ts/experimental.h | 4 - include/ts/remap_version.h | 43 +++++ include/ts/ts.h | 49 +----- include/tscore/DbgCtl.h | 62 ------- include/tscore/Diags.h | 49 ++---- include/tscore/DiagsTypes.h | 7 - include/tscore/Trie.h | 4 +- include/tscore/ink_config.h.cmake.in | 5 +- include/tscore/ink_config.h.in | 1 - include/tscore/ink_sys_control.h | 2 + include/tscpp/api/Cleanup.h | 11 -- iocore/aio/AIO.cc | 184 +-------------------- iocore/aio/I_AIO.h | 69 -------- iocore/aio/P_AIO.h | 33 ---- iocore/aio/test_AIO.cc | 9 - iocore/cache/Cache.cc | 85 +--------- iocore/cache/CacheDir.cc | 2 +- iocore/cache/CacheHosting.cc | 4 +- iocore/cache/CacheRead.cc | 29 ++-- iocore/cache/CacheWrite.cc | 2 +- iocore/dns/DNS.cc | 4 +- iocore/dns/P_DNSProcessor.h | 2 +- iocore/dns/SplitDNS.cc | 4 +- iocore/eventsystem/I_EThread.h | 10 ++ iocore/eventsystem/I_SocketManager.h | 2 - iocore/eventsystem/UnixEThread.cc | 1 + iocore/net/I_Net.h | 1 - iocore/net/Net.cc | 9 +- iocore/net/P_SSLNetVConnection.h | 15 ++ iocore/net/P_SSLNextProtocolAccept.h | 3 +- iocore/net/P_UnixNet.h | 4 +- iocore/net/PollCont.cc | 2 +- iocore/net/PollCont.h | 4 +- iocore/net/SSLDiags.cc | 10 +- iocore/net/SSLNetVConnection.cc | 92 ++++++++++- iocore/net/SSLNextProtocolAccept.cc | 59 ++++--- iocore/net/SSLUtils.cc | 4 +- iocore/net/TLSSessionResumptionSupport.cc | 2 +- iocore/net/UnixNet.cc | 1 - iocore/net/UnixUDPNet.cc | 3 +- iocore/net/test_I_UDPNet.cc | 1 - plugins/background_fetch/background_fetch.cc | 14 +- plugins/cache_promote/cache_promote.cc | 12 +- .../cache_range_requests/cache_range_requests.cc | 13 +- plugins/compress/compress.cc | 13 +- plugins/experimental/cache_fill/cache_fill.cc | 14 +- plugins/experimental/fq_pacing/fq_pacing.cc | 17 +- plugins/experimental/geoip_acl/geoip_acl.cc | 13 +- plugins/experimental/maxmind_acl/maxmind_acl.cc | 13 +- plugins/experimental/money_trace/money_trace.cc | 13 +- .../parent_select/consistenthash_config.cc | 115 ++++++------- .../experimental/parent_select/parent_select.cc | 17 +- plugins/experimental/rate_limit/ip_reputation.cc | 19 ++- plugins/experimental/rate_limit/rate_limit.cc | 13 +- .../experimental/ssl_session_reuse/src/publish.cc | 4 +- plugins/experimental/uri_signing/uri_signing.cc | 14 +- plugins/experimental/url_sig/url_sig.cc | 13 +- .../experimental/webp_transform/ImageTransform.cc | 24 +-- plugins/header_rewrite/header_rewrite.cc | 18 +- plugins/lua/ts_lua_transform.cc | 4 +- plugins/regex_remap/regex_remap.cc | 13 +- plugins/s3_auth/s3_auth.cc | 13 +- proxy/ProtocolProbeSessionAccept.cc | 10 +- proxy/http/HttpProxyServerMain.cc | 2 +- proxy/http/HttpSM.cc | 6 +- proxy/http/unit_tests/CMakeLists.txt | 1 - proxy/http3/CMakeLists.txt | 14 +- proxy/logging/LogStandalone.cc | 5 +- src/api/CMakeLists.txt | 2 + src/records/CMakeLists.txt | 2 + src/records/RecHttp.cc | 18 ++ .../CMakeLists.txt | 8 +- src/traffic_layout/info.cc | 1 - .../CMakeLists.txt | 6 +- src/{api => traffic_logstats}/CMakeLists.txt | 27 ++- src/traffic_logstats/tests/test_logstats_json | 4 + src/traffic_logstats/tests/test_logstats_summary | 6 +- src/traffic_quic/traffic_quic.cc | 1 - src/traffic_server/CMakeLists.txt | 3 - src/traffic_server/InkAPI.cc | 38 +---- src/traffic_server/traffic_server.cc | 32 ++-- src/{traffic_wccp => traffic_top}/CMakeLists.txt | 7 +- src/{traffic_wccp => traffic_via}/CMakeLists.txt | 11 +- src/traffic_via/test_traffic_via | 6 +- src/traffic_wccp/CMakeLists.txt | 1 + src/tscore/DbgCtl.cc | 58 ++++--- src/tscore/Diags.cc | 10 +- src/tscore/ink_sys_control.cc | 17 ++ tests/README.md | 9 - tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.cc | 32 ++-- .../polite_hook_wait/polite_hook_wait.cc | 13 +- tests/gold_tests/pluginTest/tsapi/test_tsapi.cc | 25 +-- tests/gold_tests/tls/allow-plain.test.py | 94 +++++++++++ .../gold_tests/tls/replay/allow-plain.replay.yaml | 59 +++++++ tests/tools/plugins/user_args.cc | 18 +- 106 files changed, 887 insertions(+), 1153 deletions(-)
