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 730d737d1274c990a2c6896805ef69fa05b50fb9 Merge: b03a27a75d 6dfbff3235 Author: bneradt <[email protected]> AuthorDate: Mon Aug 5 11:21:04 2024 -0500 Merge latest master into 11-Dev CMakeLists.txt | 5 + configs/records.yaml.default.in | 1 + doc/admin-guide/files/ip_allow.yaml.en.rst | 15 +- doc/admin-guide/files/records.yaml.en.rst | 25 ++- doc/admin-guide/files/remap.config.en.rst | 234 ++++++++++++++++----- .../cache-architecture/architecture.en.rst | 2 +- .../cache-architecture/data-structures.en.rst | 14 +- include/proxy/http/remap/RemapConfig.h | 6 +- include/proxy/http/remap/UrlRewrite.h | 12 +- include/tscore/ink_config.h.cmake.in | 1 + src/iocore/cache/CMakeLists.txt | 1 + src/iocore/cache/CacheDir.cc | 1 + src/iocore/cache/CacheEvacuateDocVC.cc | 1 + src/iocore/cache/P_CacheDir.h | 1 + src/iocore/cache/P_CacheVol.h | 122 +---------- src/iocore/cache/PreservationTable.cc | 161 ++++++++++++++ src/iocore/cache/PreservationTable.h | 176 ++++++++++++++++ src/iocore/cache/Stripe.h | 10 - src/iocore/cache/StripeSM.cc | 129 +----------- src/iocore/net/CMakeLists.txt | 10 +- src/iocore/net/OCSPStapling.cc | 9 +- src/iocore/net/P_OCSPStapling.h | 6 - src/iocore/net/SSLUtils.cc | 6 +- src/iocore/net/UnixNetVConnection.cc | 3 - .../{P_OCSPStapling.h => unit_tests/test_Net.cc} | 24 +-- src/proxy/IPAllow.cc | 2 +- src/proxy/http/remap/RemapConfig.cc | 16 +- src/proxy/http/remap/UrlRewrite.cc | 30 +-- src/records/RecordsConfig.cc | 2 +- tests/gold_tests/autest-site/when.test.ext | 23 ++ tests/gold_tests/ip_allow/ip_category.test.py | 2 +- .../pluginTest/prefetch/prefetch_bignum.test.py | 6 +- .../pluginTest/prefetch/prefetch_cmcd.test.py | 10 +- .../pluginTest/prefetch/prefetch_overflow.test.py | 6 +- .../pluginTest/prefetch/prefetch_simple.test.py | 6 +- tests/gold_tests/remap/all_acl_combinations.py | 176 ++++++++-------- tests/gold_tests/remap/deactivate_ip_allow.py | 102 ++++----- tests/gold_tests/remap/remap_acl.test.py | 54 ++--- 38 files changed, 843 insertions(+), 567 deletions(-)
