You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficserver.apache.org by ma...@apache.org on 2022/07/07 02:28:00 UTC

[trafficserver] 12/12: Merge branch 'master' into quiche

This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch quiche
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 4610e972ca354e674f81de18eddb95ea5037bb8c
Merge: 0fb15d2ff 33e34b947
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Thu Jul 7 11:23:53 2022 +0900

    Merge branch 'master' into quiche

 Makefile.am                                        | 28 ++++++++++++---
 doc/admin-guide/logging/formatting.en.rst          |  3 +-
 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 +++++++++--
 14 files changed, 122 insertions(+), 24 deletions(-)