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 2018/08/01 01:01:50 UTC
[trafficserver] 02/02: Merge branch 'asf/master' into quic-latest
This is an automated email from the ASF dual-hosted git repository.
masaori pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 38104e981d592bc95271f8fb3eca95cb29b16443
Merge: 6365480 2ded013
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Aug 1 09:58:19 2018 +0900
Merge branch 'asf/master' into quic-latest
* asf/master: (44 commits)
Updates the default ciphers to avoid weak ciphers(non FS)
Fixed Spelling.
Removes remnants of dprintf support
Change the defauilt connect_ports docs to reflect the code
Fixing copy paste error in SNI yaml parsing
Removes more references to traffic_cop and cop related functionality
Fixes ticket loading from filesystems without a mtime
Add support for 'fwd' value to X-Debug header, and move to later hook any deletion of X-Debug header from client request.
For PostScript class, remove problematic parameter forwarding to functor (rely on lambda capturing instead).
Modifies init script to add start/reload hooks
fix another crash on shutdown and add unlikely
Revert "Do not do DNS to origin if the object is HIT-STALE and parent exists"
Dockerfile for CentOS/Fedora, i.e. yum dependencies
Revert "Fix post process to propagate early server response."
Revert "Fix post_error test by initializating the address length of the accept call."
Revert "Fix crashes from early post return fix."
Removes old commented-out code
Test: Convert test_Ptr.cc to Catch.
TextView: Unit tests for token handling on single characters, and with trim.
TS-4765: Removes previously deprecated cqbl and pqbl log tags
...
CMakeLists.txt | 7 +-
README | 13 +-
build/brotli.m4 | 18 +--
build/luajit.m4 | 176 +++++++++++++++++++++
ci/docker/yum/Dockerfile | 68 ++++++++
configs/records.config.default.in | 2 +-
configure.ac | 115 ++++----------
doc/.tx/config | 5 -
doc/admin-guide/files/records.config.en.rst | 11 +-
doc/admin-guide/logging/formatting.en.rst | 4 +
.../monitoring/statistics/core/general.en.rst | 3 -
doc/admin-guide/performance/index.en.rst | 4 +-
doc/admin-guide/plugins/lua.en.rst | 6 +-
doc/admin-guide/plugins/xdebug.en.rst | 7 +-
doc/appendices/command-line/traffic_server.en.rst | 2 -
doc/checkvers.sh | 40 -----
.../internal-libraries/intrusive-list.en.rst | 65 +++++---
iocore/net/SSLConfig.cc | 7 +-
iocore/net/UnixNetAccept.cc | 2 +-
iocore/net/UnixNetProcessor.cc | 3 +
iocore/net/YamlSNIConfig.cc | 2 +-
lib/perl/lib/Apache/TS/AdminClient.pm | 1 +
lib/records/Makefile.am | 7 +-
lib/records/P_RecCore.cc | 25 +++
lib/records/P_RecFile.h | 3 +
lib/records/P_RecMessage.h | 1 -
lib/records/RecCore.cc | 2 +-
lib/records/RecFile.cc | 36 +++++
lib/records/RecLocal.cc | 9 --
lib/records/RecMessage.cc | 4 +-
lib/records/RecProcess.cc | 19 ---
lib/ts/History.h | 1 +
lib/ts/Makefile.am | 10 +-
lib/ts/PostScript.h | 65 ++++++++
lib/ts/TextView.h | 28 ++++
lib/ts/ink_error.h | 2 -
lib/ts/ink_res_init.cc | 2 +-
lib/ts/ink_sock.cc | 1 -
lib/ts/ink_sprintf.cc | 1 +
lib/ts/runroot.cc | 81 +++++-----
lib/ts/runroot.h | 4 -
lib/ts/test_History.cc | 111 -------------
lib/ts/test_Ptr.cc | 99 ------------
lib/ts/unit-tests/test_History.cc | 117 ++++++++++++++
lib/ts/unit-tests/test_IntrusiveDList.cc | 27 +++-
mgmt/Cop.h => lib/ts/unit-tests/test_PostScript.cc | 62 +++++++-
lib/ts/unit-tests/test_Ptr.cc | 80 ++++++++++
lib/ts/{ => unit-tests}/test_Regex.cc | 35 ++--
lib/ts/unit-tests/test_TextView.cc | 63 +++++++-
mgmt/RecordsConfig.cc | 4 +-
mgmt/api/include/mgmtapi.h | 2 +-
plugins/compress/Makefile.inc | 4 +-
plugins/lua/Makefile.inc | 2 +-
plugins/xdebug/xdebug.cc | 148 ++++++++++++++---
proxy/hdrs/MIME.h | 4 +-
proxy/http/HttpBodyFactory.cc | 1 -
proxy/http/HttpBodyFactory.h | 10 +-
proxy/http/HttpConfig.cc | 54 +++++++
proxy/http/HttpConfig.h | 6 +
proxy/http/HttpSM.cc | 31 +---
proxy/http/HttpTransact.cc | 32 ++--
proxy/http/HttpTransact.h | 11 --
proxy/http2/Http2ConnectionState.cc | 2 +
proxy/http2/Http2ConnectionState.h | 10 +-
proxy/http2/Http2Stream.cc | 4 +-
proxy/logging/Log.cc | 20 +--
proxy/logging/LogAccess.cc | 13 ++
proxy/logging/LogAccess.h | 2 +
proxy/logging/LogAccessHttp.cc | 16 ++
proxy/logging/LogAccessHttp.h | 2 +
rc/trafficserver.in | 35 ++++
src/traffic_ctl/config.cc | 5 -
src/traffic_layout/engine.cc | 39 ++++-
src/traffic_manager/traffic_manager.cc | 1 -
src/traffic_server/CoreUtils.cc | 4 -
src/traffic_server/HostStatus.cc | 2 +-
src/traffic_server/Makefile.inc | 11 +-
src/traffic_server/SocksProxy.cc | 5 -
src/traffic_server/traffic_server.cc | 23 +--
src/traffic_top/traffic_top.cc | 2 -
tests/gold_tests/autest-site/microserver.test.ext | 7 +-
tests/gold_tests/pluginTest/xdebug/x_remap/fwd1.in | 4 +
tests/gold_tests/pluginTest/xdebug/x_remap/fwd2.in | 4 +
tests/gold_tests/pluginTest/xdebug/x_remap/fwd3.in | 4 +
tests/gold_tests/pluginTest/xdebug/x_remap/fwd4.in | 4 +
tests/gold_tests/pluginTest/xdebug/x_remap/fwd5.in | 4 +
.../gold_tests/pluginTest/xdebug/x_remap/out.gold | 139 +++++++++++-----
.../xdebug/x_remap/x_remap-observer.py} | 21 ++-
.../pluginTest/xdebug/x_remap/x_remap.gold | 16 ++
.../pluginTest/xdebug/x_remap/x_remap.test.py | 20 ++-
tests/gold_tests/post_error/gold/post_error.gold | 3 -
tests/gold_tests/post_error/post_error.test.py | 69 --------
tests/gold_tests/post_error/post_server.c | 105 ------------
tests/gold_tests/runroot/runroot_error.test.py | 4 +-
tests/tools/microServer/uWServer.py | 25 ++-
95 files changed, 1479 insertions(+), 911 deletions(-)
diff --cc lib/ts/Makefile.am
index 35d6160,ef44472..2e3f576
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@@ -287,14 -275,12 +286,17 @@@ test_tslib_SOURCES =
unit-tests/test_MemSpan.cc \
unit-tests/test_MemArena.cc \
unit-tests/test_MT_hashtable.cc \
+ unit-tests/test_PostScript.cc \
+ unit-tests/test_Ptr.cc \
+ unit-tests/test_Regex.cc \
unit-tests/test_Scalar.cc \
unit-tests/test_scoped_resource.cc \
- unit-tests/test_TextView.cc
+ unit-tests/test_TextView.cc
+
+if HAS_HKDF
+test_tslib_SOURCES += \
+ unit-tests/test_HKDF.cc
+endif
CompileParseRules_SOURCES = CompileParseRules.cc
diff --cc src/traffic_server/Makefile.inc
index c67b0d0,8175f78..dc7e7fe
--- a/src/traffic_server/Makefile.inc
+++ b/src/traffic_server/Makefile.inc
@@@ -97,8 -91,6 +92,12 @@@ traffic_server_traffic_server_LDADD =
@YAMLCPP_LIBS@ \
-lm
+ if IS_DARWIN
+ traffic_server_traffic_server_LDADD += $(LUAJIT_DARWIN_LDFLAGS)
+ endif
++
+if ENABLE_QUIC
+traffic_server_traffic_server_LDADD += \
+ $(top_builddir)/proxy/hq/libhq.a \
+ $(top_builddir)/iocore/net/quic/libquic.a
+endif