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/05/14 01:23:28 UTC
[trafficserver] branch quic-latest updated (a404ce9 -> df98d80)
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a change to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
omit a404ce9 Merge branch 'master' into quic-latest
new df98d80 Merge branch 'master' into quic-latest
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a404ce9)
\
N -- N -- N refs/heads/quic-latest (df98d80)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.
[trafficserver] 01/01: Merge branch 'master' into quic-latest
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit df98d80f2816ab2883af59dc4534fae89d45ef5e
Merge: 85fb9f6 d4557f1
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Mon May 14 10:23:01 2018 +0900
Merge branch 'master' into quic-latest
.editorconfig | 5 +-
.vscode/c_cpp_properties.json | 148 +
CMakeLists.txt | 86 +-
README | 4 +-
REVIEWERS | 1 -
cmd/Makefile.am | 1 -
cmd/traffic_cache_tool/CacheDefs.cc | 129 +-
cmd/traffic_cache_tool/CacheDefs.h | 282 +-
cmd/traffic_cache_tool/CacheScan.cc | 339 +
cmd/traffic_cache_tool/CacheScan.h | 56 +
cmd/traffic_cache_tool/CacheTool.cc | 40 +-
cmd/traffic_cache_tool/File.cc | 8 +-
cmd/traffic_cache_tool/File.h | 33 +-
cmd/traffic_cache_tool/Makefile.am | 6 +-
cmd/traffic_cop/Makefile.am | 45 -
cmd/traffic_cop/traffic_cop.cc | 1767 --
cmd/traffic_ctl/config.cc | 2 -
cmd/traffic_manager/AddConfigFilesHere.cc | 1 -
cmd/traffic_manager/Makefile.am | 2 -
cmd/traffic_manager/MgmtHandlers.cc | 285 -
cmd/traffic_manager/traffic_manager.cc | 38 +-
configure.ac | 20 +-
doc/.tx/config | 10 -
doc/admin-guide/files/metrics.config.en.rst | 143 -
doc/admin-guide/files/records.config.en.rst | 83 +-
doc/admin-guide/installation/index.en.rst | 5 +-
doc/admin-guide/introduction.en.rst | 15 +-
doc/admin-guide/logging/formatting.en.rst | 21 +
doc/admin-guide/logging/understanding.en.rst | 3 +-
doc/admin-guide/monitoring/alarms.en.rst | 6 +-
.../monitoring/statistics/core/bandwidth.en.rst | 41 -
.../monitoring/statistics/core/cache.en.rst | 70 +-
.../monitoring/statistics/core/congestion.en.rst | 30 -
.../monitoring/statistics/core/dns.en.rst | 19 -
.../monitoring/statistics/core/general.en.rst | 5 +-
.../monitoring/statistics/core/hierarchical.en.rst | 5 +-
.../monitoring/statistics/core/hostdb.en.rst | 41 -
.../statistics/core/http-connection.en.rst | 25 +-
.../statistics/core/http-transaction.en.rst | 139 -
.../monitoring/statistics/core/log.en.rst | 110 -
.../monitoring/statistics/core/origin.en.rst | 16 +-
doc/admin-guide/plugins/index.en.rst | 8 +-
doc/admin-guide/plugins/ts_lua.en.rst | 216 +-
doc/appendices/command-line/traffic_cop.en.rst | 70 -
doc/appendices/faq.en.rst | 18 -
.../api/functions/TSHttpOverridableConfig.en.rst | 1 +
.../api/types/TSRecordUpdateType.en.rst | 4 -
doc/developer-guide/api/types/TSServerState.en.rst | 4 +-
doc/developer-guide/config-vars.en.rst | 3 -
doc/developer-guide/core-architecture/rpc.en.rst | 3 +-
.../admin-guide/files/congestion.config.en.po | 375 -
.../monitoring/statistics/core/bandwidth.en.po | 39 +-
.../monitoring/statistics/core/cache.en.po | 40 -
.../monitoring/statistics/core/congestion.en.po | 33 -
.../monitoring/statistics/core/hostdb.en.po | 6 -
doc/manpages.py | 1 -
iocore/cache/CacheHosting.cc | 3 +
iocore/eventsystem/I_Event.h | 1 -
iocore/hostdb/P_HostDBProcessor.h | 2 +-
iocore/net/OCSPStapling.cc | 2 +-
iocore/net/P_SSLUtils.h | 3 +
iocore/net/SSLNetProcessor.cc | 1 +
iocore/net/SSLSessionCache.cc | 2 -
iocore/net/SSLSessionCache.h | 1 -
iocore/net/SSLUtils.cc | 34 +-
lib/perl/lib/Apache/TS/AdminClient.pm | 15 -
lib/records/I_RecAlarms.h | 2 -
lib/records/I_RecDefs.h | 1 -
lib/records/I_RecSignals.h | 2 -
lib/records/RecLocal.cc | 5 -
lib/ts/BaseLogFile.cc | 2 +-
lib/ts/BufferWriter.h | 19 +-
lib/ts/CryptoHash.h | 4 +-
lib/ts/HashMD5.cc | 3 +-
lib/ts/List.h | 4 +-
lib/ts/Makefile.am | 1 +
lib/ts/Map.h | 6 +-
lib/ts/RbTree.cc | 2 +-
lib/ts/apidefs.h.in | 4 +-
lib/ts/ink_assert.h | 5 +-
lib/ts/ink_hrtime.cc | 1 +
lib/ts/ink_inet.cc | 4 +-
lib/ts/ink_inet.h | 13 +-
lib/ts/ink_platform.h | 3 +
lib/ts/unit-tests/test_BufferWriterFormat.cc | 1 -
lib/ts/unit-tests/test_IpMap.cc | 2 +-
lib/ts/unit-tests/test_TextView.cc | 4 +-
.../ts/unit-tests/test_scoped_resource.cc | 35 +-
mgmt/Alarms.cc | 7 -
mgmt/Alarms.h | 7 +-
mgmt/BaseManager.h | 2 -
mgmt/LocalManager.cc | 8 -
mgmt/RecordsConfig.cc | 28 +-
mgmt/WebMgmtUtils.cc | 2 +-
mgmt/api/APITestCliRemote.cc | 39 +-
mgmt/api/GenericParser.cc | 13 -
mgmt/api/GenericParser.h | 2 -
mgmt/api/NetworkMessage.cc | 1 +
mgmt/api/include/mgmtapi.h | 1 -
plugins/Makefile.am | 3 +-
.../{experimental/epic => cachekey}/Makefile.inc | 11 +-
plugins/{experimental => }/cachekey/README.md | 2 +-
plugins/{experimental => }/cachekey/cachekey.cc | 0
plugins/{experimental => }/cachekey/cachekey.h | 0
plugins/{experimental => }/cachekey/common.cc | 0
plugins/{experimental => }/cachekey/common.h | 0
plugins/{experimental => }/cachekey/configs.cc | 0
plugins/{experimental => }/cachekey/configs.h | 0
plugins/{experimental => }/cachekey/pattern.cc | 0
plugins/{experimental => }/cachekey/pattern.h | 0
plugins/{experimental => }/cachekey/plugin.cc | 0
.../cachekey/tests/pattern_test.cc | 0
plugins/compress/configuration.h | 8 +-
plugins/compress/debug_macros.h | 5 -
plugins/experimental/cachekey/Makefile.inc | 23 -
.../collapsed_connection/collapsed_connection.cc | 2 +-
plugins/experimental/epic/epic.cc | 386 -
plugins/experimental/ts_lua/ts_lua_http.c | 62 +-
plugins/experimental/ts_lua/ts_lua_http_config.c | 2 +
plugins/experimental/ts_lua/ts_lua_misc.c | 160 +-
proxy/CoreUtils.cc | 2 +-
proxy/HostStatus.cc | 11 +-
proxy/InkAPI.cc | 7 +-
proxy/InkAPITest.cc | 6 +-
proxy/Main.cc | 8 -
proxy/ParentConsistentHash.cc | 13 +-
proxy/ParentSelection.cc | 9 +-
proxy/ProxyClientSession.cc | 18 +
proxy/ProxyClientSession.h | 15 +
proxy/ProxyClientTransaction.cc | 16 +
proxy/ProxyClientTransaction.h | 2 +
proxy/ReverseProxy.cc | 6 -
proxy/config/Makefile.am | 1 -
proxy/config/body_factory/default/Makefile.am | 1 -
.../body_factory/default/congestion#retryAfter | 15 -
proxy/config/congestion.config.default | 59 -
proxy/config/hosting.config.default | 4 +-
proxy/config/ip_allow.config.default | 2 +-
proxy/config/logging.config.default | 2 +-
proxy/config/metrics.config.default | 1202 +-
proxy/config/records.config.default.in | 2 +-
proxy/config/remap.config.default | 2 +-
proxy/config/socks.config.default | 4 +-
proxy/congest/FeatureSpec.txt | 428 -
proxy/congest/Makefile.am | 44 -
proxy/hdrs/HdrTest.cc | 2 +-
proxy/hdrs/HttpCompat.cc | 3 +-
proxy/http/Http1ClientTransaction.cc | 6 +
proxy/http/Http1ClientTransaction.h | 6 +-
proxy/http/HttpConfig.cc | 13 +-
proxy/http/HttpConfig.h | 13 +-
proxy/http/HttpDebugNames.cc | 4 -
proxy/http/HttpSM.cc | 54 +-
proxy/http/HttpSM.h | 2 +-
proxy/http/HttpTransact.cc | 144 +-
proxy/http/HttpTransact.h | 6 +-
proxy/http/HttpTunnel.cc | 3 +-
proxy/http/remap/UrlRewrite.cc | 12 +-
proxy/http/remap/UrlRewrite.h | 3 -
proxy/http2/Http2ConnectionState.cc | 20 +-
proxy/http2/Http2ConnectionState.h | 2 +
proxy/logging/Log.cc | 10 +
proxy/logging/LogAccess.cc | 6 +
proxy/logging/LogAccess.h | 2 +
proxy/logging/LogAccessHttp.cc | 38 +-
proxy/logging/LogAccessHttp.h | 2 +
proxy/logging/LogFilter.cc | 23 +-
proxy/logging/LogHost.cc | 15 +-
rc/trafficserver.conf.in | 2 +-
rc/trafficserver.in | 63 +-
rc/trafficserver.service.in | 2 +-
rc/trafficserver.xml.in | 2 +-
.../gold_tests/autest-site/trafficserver.test.ext | 8 +-
tests/gold_tests/basic/basic-cop.test.py | 32 -
tests/gold_tests/headers/syntax.test.py | 34 +-
tests/gold_tests/pluginTest/compress/compress.gold | 78 +-
.../pluginTest/compress/compress.test.py | 3 +-
tests/gold_tests/runroot/runroot_error.test.py | 70 +
tests/gold_tests/runroot/runroot_use.test.py | 6 +-
tests/gold_tests/runroot/runroot_verify.test.py | 67 +
tests/include/catch.hpp | 18501 ++++++++++---------
tests/tools/microServer/uWServer.py | 7 +-
tests/tools/traffic-replay/NonSSL.py | 8 +-
tools/jtest/jtest.cc | 8 +-
tools/traffic_shell.pl | 730 -
185 files changed, 11903 insertions(+), 15853 deletions(-)
diff --cc lib/ts/Makefile.am
index 7bb1365,2cc746d..4175d8a
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@@ -286,13 -274,9 +286,14 @@@ test_tslib_SOURCES =
unit-tests/test_MT_hashtable.cc \
unit-tests/test_Scalar.cc \
unit-tests/test_string_view.cc \
+ unit-tests/test_scoped_resource.cc \
unit-tests/test_TextView.cc
+if HAS_HKDF
+test_tslib_SOURCES += \
+ unit-tests/test_HKDF.cc
+endif
+
CompileParseRules_SOURCES = CompileParseRules.cc
clean-local:
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.