You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2019/01/09 17:37:03 UTC
[trafficserver] 01/01: Merge branch '8.0.x' into 8.1.x
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 2a089062773fa6b7db985a18f841e5c1a8d85a44
Merge: f859127 e8ee826
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Jan 9 09:36:43 2019 -0800
Merge branch '8.0.x' into 8.1.x
Conflicts:
configure.ac
tools/package/trafficserver.spec
CHANGELOG-8.0.2 | 11 +++
STATUS | 8 +-
doc/Makefile.am | 2 +-
doc/admin-guide/plugins/sslheaders.en.rst | 2 +-
doc/ext/local-config.py.in | 13 +++-
doc/{ => ext}/plantuml_fetch.sh | 0
doc/ext/traffic-server.py | 12 ++-
doc/uml/Makefile.am | 2 +-
iocore/eventsystem/I_VConnection.h | 2 +-
iocore/eventsystem/P_UnixEventProcessor.h | 7 +-
plugins/experimental/sslheaders/expand.cc | 2 +-
plugins/experimental/sslheaders/sslheaders.cc | 82 ++++++++++++++-----
plugins/experimental/sslheaders/sslheaders.h | 8 +-
proxy/ProxyClientSession.cc | 3 +-
proxy/http/HttpSM.cc | 7 +-
tests/gold_tests/pluginTest/sslheaders/observer.py | 31 ++++++++
.../pluginTest/sslheaders/ssl/server.key | 28 +++++++
.../pluginTest/sslheaders/ssl/server.pem | 21 +++++
.../pluginTest/sslheaders/sslheaders.gold | 1 +
.../pluginTest/sslheaders/sslheaders.test.py | 91 ++++++++++++++++++++++
20 files changed, 293 insertions(+), 40 deletions(-)