You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2022/07/08 01:24:40 UTC
[trafficserver] 01/01: Merge the latest master branch into 10-Dev
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch 10-Dev
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit b4f16e89eb87ef5885eb5093ac0f6b28b5b219e2
Merge: 0272d2c20 b75066adf
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Fri Jul 8 01:19:07 2022 +0000
Merge the latest master branch into 10-Dev
This merge had no conflicts.
.asf.yaml | 7 ++++
Makefile.am | 28 ++++++++++++---
doc/admin-guide/logging/formatting.en.rst | 3 +-
doc/admin-guide/plugins/rate_limit.en.rst | 6 ++++
doc/admin-guide/plugins/remap_stats.en.rst | 18 ++++++----
iocore/net/P_NetVConnection.h | 6 +---
iocore/net/SSLNetVConnection.cc | 4 +--
iocore/net/SSLUtils.cc | 1 +
proxy/ProtocolProbeSessionAccept.cc | 3 +-
proxy/http/HttpSM.cc | 2 +-
proxy/http/HttpTransactHeaders.cc | 15 ++++++--
tests/gold_tests/proxy_protocol/gold/access.gold | 3 ++
.../proxy_protocol/gold/test_case_0_stdout.gold | 2 +-
.../proxy_protocol/gold/test_case_1_stdout.gold | 2 +-
.../proxy_protocol/gold/test_case_2_stdout.gold | 14 ++++++++
.../proxy_protocol/proxy_protocol.test.py | 42 +++++++++++++++++++++-
tools/clang-format.sh | 21 +++++++++--
17 files changed, 147 insertions(+), 30 deletions(-)