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/29 05:51:31 UTC
[trafficserver] 01/04: 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 3697b2335ee4bd210bc760f0d3a5469a3c5f59af
Merge: f429053 61d9778
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Aug 29 12:26:24 2018 +0900
Merge branch 'asf/master' into quic-latest
* asf/master: (86 commits)
IPAllow: Refresh for C++11, fix potential use after free. PR #4129.
Doc: Remove deprecated configs from examples of traffic_ctl
Fix crash in Http2ClientSession::release_netvc
Revert "Ensure continuation lock on read and write signal"
Move handleEvent back into the header file.
Corrects IPv4 multicast ip address check
Cleanup: Remove #define INT_TO_BOOL, use local lambda instead.
Clang-format: Redo clang-format error that slipped through.
Cleanup: remove unused and unimplemented functions from ink_string.h
HttpConnectionCount: Replace TSHashTable with IntrusiveHashMap.
Outbound server session management - Replace TSHashTable with IntrusiveHashMap.
IntrusiveHashMap: Add overloads to apply method to support functor taking reference or pointer.
IntrusiveHashMap: Update erase methods. Add additional iterator_for methods for erase.
IntrusiveHashMap: Change range to be std::pair based for better compatibility.
IntrusiveHashMap: remove from "ts" namespace. The predecessor class, TSHashTable, wasn't in "ts" and having worked with IntrusiveHashMap for a while, I think it's best this isn't either.
IntrusiveDList: Update erase methods.
IntrusiveDList: Add user conversion from iterator to pointer to value_type.
Completes documentation regarding redirects
Completes & deduplicates code comment for redirect
IntrusiveHashMap: Refresh TSHashTable for C++ eleventy.
...
CMakeLists.txt | 5 +-
configure.ac | 19 +
doc/admin-guide/files/logging.yaml.en.rst | 4 +-
doc/admin-guide/files/records.config.en.rst | 21 +-
doc/admin-guide/files/ssl_multicert.config.en.rst | 11 -
doc/admin-guide/layer-4-routing.en.rst | 7 +
doc/admin-guide/logging/destinations.en.rst | 7 +
doc/admin-guide/logging/formatting.en.rst | 5 +
doc/admin-guide/plugins/access_control.en.rst | 478 +++
doc/admin-guide/plugins/cachekey.en.rst | 29 +-
doc/admin-guide/plugins/index.en.rst | 12 +
doc/admin-guide/plugins/multiplexer.en.rst | 118 +
doc/admin-guide/plugins/prefetch.en.rst | 278 ++
doc/appendices/command-line/traffic_ctl.en.rst | 6 +-
.../command-line/traffic_logstats.en.rst | 46 +
doc/conf.py | 5 +-
.../api/functions/TSContCall.en.rst | 45 +
.../internal-libraries/AcidPtr.en.rst | 286 ++
.../internal-libraries/Extendible.en.rst | 260 ++
.../internal-libraries/MemArena.en.rst | 309 +-
.../internal-libraries/buffer-writer.en.rst | 50 +-
.../internal-libraries/index.en.rst | 3 +
.../internal-libraries/intrusive-hash-map.en.rst | 197 ++
.../internal-libraries/intrusive-list.en.rst | 35 +-
.../monitoring/logging/log-collation.en.po | 210 --
.../images/admin/prefetch_plugin_deployment.png | Bin 0 -> 222757 bytes
example/remap/remap.cc | 2 +-
example/secure_link/secure_link.c | 2 +-
iocore/dns/DNS.cc | 2 +-
.../Continuation.cc} | 28 +-
iocore/eventsystem/I_Continuation.h | 23 +-
iocore/eventsystem/I_Event.h | 1 -
iocore/eventsystem/I_Lock.h | 38 -
iocore/eventsystem/Makefile.am | 1 +
iocore/eventsystem/UnixEThread.cc | 3 +-
iocore/eventsystem/UnixEventProcessor.cc | 4 +-
iocore/hostdb/HostDB.cc | 37 +-
iocore/net/I_NetProcessor.h | 23 -
iocore/net/I_SessionAccept.h | 8 +-
iocore/net/Makefile.am | 1 -
iocore/net/P_NetAccept.h | 4 +-
iocore/net/P_NetVCTest.h | 1 +
iocore/net/P_SSLNetVConnection.h | 13 +-
iocore/net/P_UnixNetVConnection.h | 6 +
iocore/net/SSLNetVConnection.cc | 42 +-
iocore/net/SSLUtils.cc | 5 +
iocore/net/UnixNetAccept.cc | 92 +-
iocore/net/UnixNetProcessor.cc | 151 +-
iocore/net/UnixNetVConnection.cc | 28 +-
iocore/net/UnixUDPNet.cc | 2 +-
iocore/utils/I_Machine.h | 5 +-
lib/cppapi/Transaction.cc | 4 +-
lib/cppapi/include/atscppapi/Transaction.h | 4 +-
lib/records/P_RecCore.cc | 19 +-
lib/records/P_RecUtils.h | 2 +-
lib/records/RecConfigParse.cc | 2 +-
lib/records/RecRawStats.cc | 6 +-
lib/records/RecUtils.cc | 36 +-
lib/records/test_RecordsConfig.h | 4 +-
iocore/net/SessionAccept.cc => lib/ts/AcidPtr.cc | 39 +-
lib/ts/AcidPtr.h | 199 ++
lib/ts/BufferWriter.h | 39 +-
lib/ts/Diags.cc | 8 +-
lib/ts/Extendible.h | 586 ++++
lib/ts/IntrusiveDList.h | 77 +-
lib/ts/IntrusiveHashMap.h | 723 +++++
lib/ts/MT_hashtable.h | 882 +++---
lib/ts/Makefile.am | 9 +-
lib/ts/MemArena.cc | 99 +-
lib/ts/MemArena.h | 161 +-
lib/ts/SourceLocation.cc | 16 +-
lib/ts/SourceLocation.h | 12 +
lib/ts/TextView.cc | 19 +-
lib/ts/TextView.h | 23 +-
lib/ts/Tokenizer.cc | 2 +-
lib/ts/Trie.h | 1 +
lib/ts/bwf_std_format.h | 31 +
lib/ts/ink_config.h.in | 5 +-
lib/ts/ink_defs.cc | 2 +-
lib/ts/ink_error.cc | 2 +-
lib/ts/ink_inet.h | 2 +-
lib/ts/ink_string.h | 3 -
lib/ts/runroot.cc | 49 +-
lib/ts/runroot.h | 4 +-
lib/ts/unit-tests/test_AcidPtr.cc | 96 +
lib/ts/unit-tests/test_BufferWriterFormat.cc | 31 +
lib/ts/unit-tests/test_Extendible.cc | 286 ++
lib/ts/unit-tests/test_History.cc | 22 +-
lib/ts/unit-tests/test_IntrusiveHashMap.cc | 148 +
lib/ts/unit-tests/test_MemArena.cc | 99 +-
lib/ts/unit-tests/test_TextView.cc | 105 +-
mgmt/Alarms.cc | 2 -
mgmt/Alarms.h | 20 +-
mgmt/BaseManager.cc | 14 +-
mgmt/BaseManager.h | 21 +-
mgmt/FileManager.cc | 10 +-
mgmt/FileManager.h | 15 +-
mgmt/LocalManager.cc | 11 +
mgmt/LocalManager.h | 18 +-
mgmt/MgmtDefs.h | 12 +-
mgmt/ProcessManager.cc | 3 -
mgmt/ProcessManager.h | 16 +-
mgmt/ProxyConfig.cc | 5 +-
mgmt/ProxyConfig.h | 14 +-
mgmt/RecordsConfig.cc | 3 +-
mgmt/RecordsConfig.h | 2 -
mgmt/RecordsConfigUtils.cc | 9 -
mgmt/Rollback.cc | 16 +-
mgmt/Rollback.h | 25 +-
mgmt/WebMgmtUtils.cc | 13 +-
mgmt/WebMgmtUtils.h | 26 +-
mgmt/api/CoreAPI.cc | 2 +-
mgmt/api/EventControlMain.h | 1 +
plugins/Makefile.am | 2 +
plugins/authproxy/authproxy.cc | 2 +-
plugins/cachekey/cachekey.cc | 119 +-
plugins/cachekey/cachekey.h | 4 +
plugins/cachekey/common.h | 2 +
plugins/cachekey/configs.cc | 52 +
plugins/cachekey/configs.h | 14 +-
plugins/cachekey/pattern.cc | 18 +
plugins/cachekey/pattern.h | 2 +
plugins/compress/README | 57 +-
plugins/compress/sample.compress.config | 13 +-
plugins/conf_remap/conf_remap.cc | 3 +-
plugins/esi/lib/SpecialIncludeHandler.h | 6 +-
plugins/experimental/access_control/.gitignore | 1 +
plugins/experimental/access_control/Makefile.inc | 38 +
plugins/experimental/access_control/README.md | 1 +
.../experimental/access_control/access_control.cc | 497 ++++
.../experimental/access_control/access_control.h | 294 ++
.../experimental/access_control/common.cc | 51 +-
.../access_control}/common.h | 26 +-
plugins/experimental/access_control/config.cc | 380 +++
plugins/experimental/access_control/config.h | 70 +
plugins/experimental/access_control/headers.cc | 213 ++
.../experimental/access_control/headers.h | 24 +-
.../access_control}/pattern.cc | 123 +-
.../access_control}/pattern.h | 18 +-
plugins/experimental/access_control/plugin.cc | 617 ++++
.../unit-tests/test_access_control.cc | 171 ++
.../access_control/unit-tests/test_utils.cc | 265 ++
plugins/experimental/access_control/utils.cc | 497 ++++
plugins/experimental/access_control/utils.h | 57 +
plugins/experimental/geoip_acl/geoip_acl.cc | 2 +-
.../header_normalize/header_normalize.cc | 2 +-
plugins/experimental/hipes/hipes.cc | 22 +-
.../memcached_remap/memcached_remap.cc | 2 +-
plugins/experimental/mp4/mp4.cc | 2 +-
plugins/experimental/mysql_remap/mysql_remap.cc | 2 +-
.../{server_push_preload => prefetch}/Makefile.inc | 14 +-
plugins/experimental/prefetch/README.md | 8 +
plugins/experimental/prefetch/common.cc | 59 +
.../{cachekey => experimental/prefetch}/common.h | 31 +-
plugins/experimental/prefetch/configs.cc | 172 ++
plugins/experimental/prefetch/configs.h | 202 ++
plugins/experimental/prefetch/fetch.cc | 739 +++++
plugins/experimental/prefetch/fetch.h | 202 ++
plugins/experimental/prefetch/fetch_policy.cc | 57 +
plugins/experimental/prefetch/fetch_policy.h | 66 +
plugins/experimental/prefetch/fetch_policy_lru.cc | 141 +
plugins/experimental/prefetch/fetch_policy_lru.h | 105 +
.../experimental/prefetch/fetch_policy_simple.cc | 80 +
.../experimental/prefetch/fetch_policy_simple.h | 50 +-
plugins/experimental/prefetch/headers.cc | 213 ++
.../experimental/prefetch/headers.h | 37 +-
.../{cachekey => experimental/prefetch}/pattern.cc | 129 +-
.../{cachekey => experimental/prefetch}/pattern.h | 56 +-
plugins/experimental/prefetch/plugin.cc | 751 +++++
.../experimental/server_push_preload/Makefile.inc | 7 +
plugins/experimental/uri_signing/uri_signing.c | 2 +-
plugins/experimental/url_sig/url_sig.c | 113 +-
plugins/header_rewrite/operators.cc | 6 +-
plugins/lua/ts_lua_http.c | 4 +-
plugins/regex_remap/regex_remap.cc | 6 +-
plugins/s3_auth/s3_auth.cc | 4 +-
plugins/stats_over_http/stats_over_http.c | 2 +-
plugins/xdebug/xdebug.cc | 2 +-
proxy/CacheControl.h | 1 -
proxy/ControlBase.cc | 1 -
proxy/ControlMatcher.cc | 1 -
proxy/IPAllow.cc | 332 ++-
proxy/IPAllow.h | 348 ++-
proxy/Main.h | 39 +-
proxy/ParentSelection.cc | 1 -
proxy/ParentSelection.h | 1 -
proxy/Plugin.cc | 1 -
proxy/PluginVC.cc | 23 +-
proxy/PluginVC.h | 4 +
proxy/ProxyClientSession.cc | 20 +-
proxy/ProxyClientSession.h | 25 +-
proxy/ProxyClientTransaction.h | 6 +-
proxy/ReverseProxy.cc | 1 -
proxy/TimeTrace.h | 7 -
proxy/Transform.cc | 6 -
proxy/TransformInternal.h | 15 -
proxy/api/ts/ts.h | 4 +-
proxy/hdrs/HttpCompat.cc | 2 +-
proxy/http/Http1ClientSession.cc | 2 +-
proxy/http/Http1ClientSession.h | 13 -
proxy/http/HttpBodyFactory.cc | 7 +-
proxy/http/HttpBodyFactory.h | 1 -
proxy/http/HttpCacheSM.h | 4 +-
proxy/http/HttpConfig.cc | 11 +-
proxy/http/HttpConnectionCount.cc | 2 +-
proxy/http/HttpConnectionCount.h | 75 +-
proxy/http/HttpProxyServerMain.cc | 1 -
proxy/http/HttpSM.cc | 184 +-
proxy/http/HttpSM.h | 21 +-
proxy/http/HttpServerSession.cc | 4 +-
proxy/http/HttpServerSession.h | 111 +-
proxy/http/HttpSessionAccept.cc | 15 +-
proxy/http/HttpSessionManager.cc | 74 +-
proxy/http/HttpSessionManager.h | 58 +-
proxy/http/HttpTransact.cc | 27 +-
proxy/http/HttpTunnel.cc | 4 +-
proxy/http/remap/AclFiltering.cc | 1 -
proxy/http/remap/AclFiltering.h | 1 -
proxy/http/remap/UrlMapping.h | 1 -
proxy/http2/Http2ClientSession.cc | 14 +-
proxy/http2/Http2ClientSession.h | 11 -
proxy/http2/Http2DependencyTree.h | 29 +-
proxy/http2/Http2SessionAccept.cc | 8 +-
proxy/http2/test_Http2DependencyTree.cc | 96 +
proxy/logging/Log.cc | 8 -
proxy/logging/Log.h | 16 +-
proxy/logging/LogAccess.cc | 3138 ++++++++++++++------
proxy/logging/LogAccess.h | 301 +-
proxy/logging/LogAccessHttp.cc | 1801 -----------
proxy/logging/LogAccessHttp.h | 222 --
proxy/logging/LogAccessTest.h | 5 +-
proxy/logging/LogBuffer.cc | 10 -
proxy/logging/LogBuffer.h | 1 -
proxy/logging/LogConfig.cc | 2 +-
proxy/logging/LogField.h | 2 -
proxy/logging/LogFile.cc | 4 -
proxy/logging/LogFile.h | 4 -
proxy/logging/LogObject.cc | 4 +-
proxy/logging/LogStandalone.cc | 1 -
proxy/logging/Makefile.am | 2 -
rc/trafficserver.in | 7 +
rc/trafficserver.service.in | 12 +-
src/traffic_layout/engine.cc | 14 +-
src/traffic_logcat/Makefile.inc | 1 +
src/traffic_logstats/Makefile.inc | 1 +
src/traffic_logstats/logstats.cc | 23 +-
src/traffic_manager/traffic_manager.cc | 3 +
src/traffic_server/Crash.cc | 3 +
src/traffic_server/InkAPI.cc | 34 +-
src/traffic_server/traffic_server.cc | 4 +-
.../gold_tests/continuations/openclose_h2.test.py | 2 +
tests/gold_tests/h2/gold/priority_0_stderr.gold | 8 +-
tests/gold_tests/h2/http2.test.py | 3 +-
tests/gold_tests/runroot/runroot_error.test.py | 7 +-
tests/gold_tests/runroot/runroot_init.test.py | 39 +-
tests/gold_tests/runroot/runroot_manager.test.py | 52 +
tests/gold_tests/runroot/runroot_remove.test.py | 12 +-
tests/gold_tests/runroot/runroot_use.test.py | 12 +-
tests/gold_tests/runroot/runroot_verify.test.py | 13 +-
tests/gold_tests/timeout/timeout.gold | 3 +
tests/gold_tests/timeout/timeout.test.py | 46 +
tests/tools/microServer/uWServer.py | 3 +-
tests/tools/plugins/custom204plugin.cc | 2 +-
263 files changed, 15378 insertions(+), 6070 deletions(-)