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 07a69de0166819dffbd5d21edd322b16f53ade0d Merge: 88292502d4 df2b050589 Author: bneradt <[email protected]> AuthorDate: Mon Mar 17 17:15:44 2025 -0500 Merge remote-tracking branch 'upstream/master' into 11-Dev Conflicts: CMakeLists.txt .github/workflows/cifuzz.yml | 2 +- CMakeLists.txt | 21 +- doc/admin-guide/files/index.en.rst | 4 +- doc/admin-guide/files/records.yaml.en.rst | 85 ++- doc/admin-guide/logging/formatting.en.rst | 2 + doc/admin-guide/plugins/access_control.en.rst | 2 +- doc/admin-guide/plugins/compress.en.rst | 17 +- doc/admin-guide/plugins/header_rewrite.en.rst | 153 ++++- doc/developer-guide/cripts/cripts-urls.en.rst | 9 +- doc/developer-guide/release-process/index.en.rst | 4 +- doc/release-notes/upgrading.en.rst | 7 + .../client_context_dump/client_context_dump.cc | 2 +- example/plugins/lua-api/modsecurity/README.md | 23 +- example/plugins/lua-api/modsecurity/example.conf | 4 +- example/plugins/lua-api/modsecurity/owasp.conf | 34 +- include/iocore/net/AcceptOptions.h | 1 + include/iocore/net/NetVConnection.h | 15 +- include/iocore/net/ProxyProtocol.h | 45 +- include/proxy/hdrs/HTTP.h | 1 + include/proxy/hdrs/MIME.h | 51 +- include/proxy/http/HttpSM.h | 12 +- include/proxy/http/HttpTunnel.h | 153 ++++- include/proxy/http2/HPACK.h | 12 +- include/proxy/logging/Log.h | 2 +- include/proxy/logging/LogAccess.h | 1 + include/proxy/logging/LogField.h | 6 + include/records/RecHttp.h | 2 + include/tscore/ink_config.h.cmake.in | 2 + include/tscore/ink_inet.h | 179 +++++- lib/swoc/CMakeLists.txt | 21 +- lib/swoc/include/swoc/DiscreteRange.h | 220 ++++++-- lib/swoc/include/swoc/IPRange.h | 52 ++ lib/swoc/include/swoc/RBTree.h | 30 +- lib/swoc/include/swoc/bwf_base.h | 24 +- lib/swoc/include/swoc/swoc_version.h | 4 +- lib/swoc/src/RBTree.cc | 101 +++- lib/swoc/src/bw_format.cc | 2 - lib/swoc/unit_tests/test_ip.cc | 294 ++++++++++ .../cache_range_requests/cache_range_requests.cc | 2 +- plugins/cachekey/common.h | 14 +- plugins/compress/compress.cc | 73 ++- plugins/compress/configuration.cc | 19 +- plugins/compress/configuration.h | 25 +- plugins/compress/misc.cc | 2 +- .../experimental/access_control/access_control.cc | 3 +- plugins/experimental/access_control/plugin.cc | 1 + .../cert_reporting_tool/cert_reporting_tool.cc | 2 +- plugins/experimental/icap/icap_plugin.cc | 2 +- plugins/experimental/wasm/ats_context.cc | 6 +- plugins/header_rewrite/conditions.cc | 160 +++++- plugins/header_rewrite/conditions.h | 185 +++++- plugins/header_rewrite/factory.cc | 17 +- plugins/header_rewrite/header_rewrite.cc | 110 +++- plugins/header_rewrite/header_rewrite_test.cc | 3 + plugins/header_rewrite/lulu.h | 5 +- plugins/header_rewrite/operators.cc | 198 ++++++- plugins/header_rewrite/operators.h | 90 +++ plugins/header_rewrite/parser.cc | 5 + plugins/header_rewrite/parser.h | 14 +- plugins/header_rewrite/ruleset.cc | 73 +-- plugins/header_rewrite/ruleset.h | 82 ++- plugins/header_rewrite/statement.cc | 22 + plugins/header_rewrite/statement.h | 35 +- plugins/header_rewrite/value.h | 6 + plugins/healthchecks/healthchecks.cc | 17 +- plugins/lua/ts_lua_client_request.cc | 12 +- plugins/lua/ts_lua_http.cc | 8 +- plugins/lua/ts_lua_server_request.cc | 21 +- src/api/InkAPI.cc | 8 +- src/cripts/tests/query_test.cc | 8 +- src/iocore/cache/Cache.cc | 16 +- src/iocore/cache/HttpTransactCache.cc | 79 ++- src/iocore/cache/P_CacheInternal.h | 18 +- .../cache/unit_tests/test_Alternate_L_to_S.cc | 12 +- .../unit_tests/test_Alternate_L_to_S_remove_L.cc | 17 +- .../unit_tests/test_Alternate_L_to_S_remove_S.cc | 17 +- .../cache/unit_tests/test_Alternate_S_to_L.cc | 12 +- .../unit_tests/test_Alternate_S_to_L_remove_L.cc | 17 +- .../unit_tests/test_Alternate_S_to_L_remove_S.cc | 17 +- src/iocore/cache/unit_tests/test_Update_header.cc | 7 +- src/iocore/eventsystem/EventSystem.cc | 1 + src/iocore/net/CMakeLists.txt | 45 +- src/iocore/net/P_UnixNetVConnection.h | 4 +- src/iocore/net/ProxyProtocol.cc | 123 +++- src/iocore/net/Server.cc | 24 +- src/iocore/net/UnixNetAccept.cc | 5 + src/iocore/net/UnixNetProcessor.cc | 8 +- src/iocore/net/UnixNetVConnection.cc | 12 +- src/iocore/net/unit_tests/test_ProxyProtocol.cc | 69 ++- src/mgmt/rpc/jsonrpc/JsonRPCManager.cc | 1 - src/proxy/FetchSM.cc | 3 +- src/proxy/hdrs/HTTP.cc | 11 +- src/proxy/hdrs/HeaderValidator.cc | 28 +- src/proxy/hdrs/MIME.cc | 14 +- src/proxy/hdrs/VersionConverter.cc | 44 +- src/proxy/http/HttpConfig.cc | 2 +- src/proxy/http/HttpProxyServerMain.cc | 4 + src/proxy/http/HttpSM.cc | 105 ++-- src/proxy/http/HttpSessionAccept.cc | 17 +- src/proxy/http/HttpTransact.cc | 119 ++-- src/proxy/http/HttpTunnel.cc | 170 ++++-- src/proxy/http/TestUrl.cc | 114 ---- src/proxy/http/remap/UrlRewrite.cc | 81 ++- .../http/remap/unit-tests/test_PluginFactory.cc | 7 +- src/proxy/http/remap/unit-tests/test_RemapRules.cc | 5 +- src/proxy/http/test_socket_close.cc | 628 --------------------- src/proxy/http/testheaders.cc | 133 ----- src/proxy/http/unit_tests/test_HttpTransact.cc | 205 +++---- src/proxy/http2/HPACK.cc | 27 +- src/proxy/http2/Http2ConnectionState.cc | 10 +- src/proxy/http2/Http2Stream.cc | 5 +- src/proxy/http2/test_HPACK.cc | 25 +- .../http2/unit_tests/test_HpackIndexingTable.cc | 35 +- src/proxy/http3/QPACK.cc | 65 +-- src/proxy/http3/test/test_QPACK.cc | 14 +- src/proxy/logging/Log.cc | 5 + src/proxy/logging/LogAccess.cc | 48 +- src/proxy/logging/LogUtils.cc | 16 +- src/proxy/logging/unit-tests/test_LogUtils.h | 14 +- src/records/RecHttp.cc | 24 +- src/records/RecYAMLDecoder.cc | 4 +- src/records/RecordsConfig.cc | 2 +- src/records/test_I_RecLocal.cc | 207 ------- src/records/test_I_RecProcess.cc | 25 - src/records/test_RecProcess.i | 608 -------------------- src/traffic_crashlog/CMakeLists.txt | 1 + src/traffic_crashlog/backtrace.cc | 11 +- src/traffic_logcat/logcat.cc | 4 +- src/traffic_server/traffic_server.cc | 10 +- src/tscore/ink_hw.cc | 26 +- src/tscore/ink_inet.cc | 7 + src/tscore/unit_tests/test_ink_inet.cc | 21 + tests/gold_tests/cripts/cripts.test.py | 73 +++ .../gold_tests/cripts/files/basic.cript | 28 +- tests/gold_tests/cripts/gold/basic_cript.gold | 16 + tests/gold_tests/early_hints/early_hints.test.py | 158 ++++++ tests/gold_tests/early_hints/early_hints_server.py | 108 ++++ .../h2/replay_h2origin/h1-client-h2-origin.yaml | 2 +- tests/gold_tests/pipeline/pipeline.test.py | 137 +++++ tests/gold_tests/pipeline/pipeline_client.py | 104 ++++ tests/gold_tests/pipeline/pipeline_server.py | 201 +++++++ .../access_control/access_control.test.py | 81 +++ .../pluginTest/access_control/etc/hmac_keys.txt | 7 + .../replays/access_control.replay.yaml | 75 +++ .../pluginTest/compress/compress-range.test.py | 64 +++ .../compress/etc/cache-true-ignore-range.config | 5 + .../compress/etc/cache-true-no-compression.config | 5 + .../compress/replay/compress-and-range.replay.yaml | 156 +++++ tests/gold_tests/post/expect_client.py | 110 ++++ tests/gold_tests/post/expect_tests.test.py | 88 +++ tests/gold_tests/{slow_post => post}/http_utils.py | 2 +- .../post/replay/expect-continue.replay.yaml | 34 +- tests/gold_tests/records/records_yaml.test.py | 6 +- tests/gold_tests/redirect/redirect_actions.test.py | 18 + tests/gold_tests/redirect/redirect_post.test.py | 1 + tests/gold_tests/remap/all_acl_combinations.py | 62 +- tests/gold_tests/remap/deactivate_ip_allow.py | 108 ++-- tests/gold_tests/remap/remap_acl.test.py | 4 +- tests/gold_tests/slow_post/quick_server.test.py | 5 +- .../timeout/inactive_client_timeout.test.py | 9 +- tests/gold_tests/timeout/slow_server.yaml | 37 +- tests/gold_tests/timeout/ssl/cert.crt | 30 +- tests/gold_tests/tunnel/tunnel_transform.test.py | 2 +- .../{gold_tests/slow_post => tools}/http_utils.py | 0 tools/benchmark/CMakeLists.txt | 2 +- tools/benchmark/benchmark_SharedMutex.cc | 2 +- tools/build_boringssl_h3_tools.sh | 2 +- tools/build_openssl_h3_tools.sh | 2 +- tools/cripts/compiler.sh | 26 +- tools/yapf.sh | 4 +- 170 files changed, 4980 insertions(+), 3029 deletions(-)
