This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch quic-latest in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 84c5fd35027ab50478b9ffe5ac8118b312f3d343 Merge: 4589908 26da8b9 Author: Leif Hedstrom <[email protected]> AuthorDate: Wed May 2 20:55:24 2018 -0600 Merge branch 'master' into quic-latest * master: downgrade 'previously indexed' cert warning to debug Ran clang-tidy with modernize-deprecated-headers Ignore temporary clang files Convert 'gzip' Au test case to 'compress'. Test: autest exercising cache-control directives Ran clang-tidy with modernize-use-override Only check for final C++ standards Conflicts: iocore/net/P_UnixUDPConnection.h .gitignore | 1 + build/ax_cxx_compile_stdcxx.m4 | 6 +- cmd/traffic_cache_tool/CacheTool.cc | 8 +- cmd/traffic_cache_tool/Command.cc | 2 +- cmd/traffic_top/stats.h | 2 +- .../DelayTransformationPlugin.cc | 18 +- example/cppapi/websocket/WebSocket.h | 10 +- example/disable_http2/disable_http2.cc | 2 +- iocore/cache/I_Cache.h | 16 +- iocore/cache/P_CacheDisk.h | 2 +- iocore/cache/P_CacheInternal.h | 44 ++--- iocore/cache/P_CacheTest.h | 6 +- iocore/cache/P_CacheVol.h | 2 +- iocore/dns/I_DNSProcessor.h | 4 +- iocore/dns/P_SplitDNSProcessor.h | 2 +- iocore/eventsystem/I_EThread.h | 6 +- iocore/eventsystem/I_Event.h | 2 +- iocore/eventsystem/I_EventProcessor.h | 2 +- iocore/eventsystem/I_IOBuffer.h | 4 +- iocore/eventsystem/I_Lock.h | 2 +- iocore/eventsystem/I_Tasks.h | 2 +- iocore/eventsystem/I_VConnection.h | 16 +- iocore/hostdb/I_HostDBProcessor.h | 4 +- iocore/net/I_NetProcessor.h | 2 +- iocore/net/I_NetVConnection.h | 14 +- iocore/net/I_SessionAccept.h | 2 +- iocore/net/I_UDPConnection.h | 2 +- iocore/net/I_UDPNet.h | 2 +- iocore/net/LuaSNIConfig.h | 2 +- iocore/net/P_NetAccept.h | 6 +- iocore/net/P_NetVCTest.h | 4 +- iocore/net/P_SSLCertLookup.h | 2 +- iocore/net/P_SSLConfig.h | 4 +- iocore/net/P_SSLNetAccept.h | 6 +- iocore/net/P_SSLNetProcessor.h | 8 +- iocore/net/P_SSLNetVConnection.h | 2 +- iocore/net/P_SSLNextProtocolAccept.h | 6 +- iocore/net/P_SSLSNI.h | 2 +- iocore/net/P_UDPConnection.h | 2 +- iocore/net/P_UDPIOEvent.h | 2 +- iocore/net/P_UDPNet.h | 2 +- iocore/net/P_UDPPacket.h | 4 +- iocore/net/P_UnixNet.h | 6 +- iocore/net/P_UnixNetVConnection.h | 2 +- iocore/net/P_UnixUDPConnection.h | 4 +- iocore/net/SSLCertLookup.cc | 4 +- iocore/net/SSLNetVConnection.cc | 2 +- iocore/utils/I_OneWayMultiTunnel.h | 4 +- iocore/utils/I_OneWayTunnel.h | 2 +- lib/cppapi/include/atscppapi/Async.h | 8 +- lib/cppapi/include/atscppapi/AsyncHttpFetch.h | 4 +- lib/cppapi/include/atscppapi/AsyncTimer.h | 6 +- lib/cppapi/include/atscppapi/GlobalPlugin.h | 2 +- .../include/atscppapi/GzipDeflateTransformation.h | 2 +- .../include/atscppapi/GzipInflateTransformation.h | 2 +- lib/cppapi/include/atscppapi/InterceptPlugin.h | 2 +- lib/cppapi/include/atscppapi/Stat.h | 2 +- lib/cppapi/include/atscppapi/Transaction.h | 2 +- lib/cppapi/include/atscppapi/TransactionPlugin.h | 2 +- .../include/atscppapi/TransformationPlugin.h | 2 +- lib/cppapi/include/atscppapi/Url.h | 2 +- lib/cppapi/include/atscppapi/utils.h | 2 +- lib/ts/Allocator.h | 2 +- lib/ts/BaseLogFile.h | 6 +- lib/ts/BufferWriter.h | 2 +- lib/ts/BufferWriterFormat.cc | 4 +- lib/ts/BufferWriterForward.h | 2 +- lib/ts/ConsistentHash.h | 2 +- lib/ts/CryptoHash.h | 4 +- lib/ts/Diags.h | 2 +- lib/ts/Hash.h | 4 +- lib/ts/HashFNV.h | 18 +- lib/ts/HashMD5.h | 12 +- lib/ts/HashSip.h | 8 +- lib/ts/INK_MD5.h | 4 +- lib/ts/InkErrno.h | 2 +- lib/ts/List.h | 2 +- lib/ts/MMH.h | 4 +- lib/ts/Map.h | 4 +- lib/ts/ParseRules.h | 2 +- lib/ts/Ptr.h | 2 +- lib/ts/SHA256.h | 8 +- lib/ts/SimpleTokenizer.h | 6 +- lib/ts/TestBox.h | 2 +- lib/ts/TextBuffer.h | 3 +- lib/ts/Trie.h | 6 +- lib/ts/ink_atomic.h | 8 +- lib/ts/ink_file.h | 2 +- lib/ts/ink_hrtime.h | 4 +- lib/ts/ink_memory.h | 6 +- lib/ts/ink_mutex.h | 3 +- lib/ts/ink_sprintf.h | 4 +- lib/ts/ink_string++.h | 2 +- lib/ts/ink_string.h | 2 +- lib/ts/ink_thread.h | 4 +- lib/ts/ink_uuid.h | 2 +- lib/ts/unit-tests/test_IpMap.cc | 8 +- lib/tsconfig/Errata.h | 2 +- lib/tsconfig/IntrusivePtr.h | 2 +- lib/tsconfig/TsValue.h | 12 +- mgmt/Alarms.h | 4 +- mgmt/FileManager.h | 2 +- mgmt/api/CoreAPI.h | 2 +- mgmt/api/GenericParser.h | 2 +- mgmt/api/include/mgmtapi.h | 5 +- mgmt/utils/MgmtMarshall.h | 2 +- plugins/background_fetch/configs.h | 2 +- plugins/background_fetch/rules.h | 2 +- plugins/compress/misc.h | 4 +- plugins/esi/fetcher/HttpDataFetcherImpl.h | 10 +- plugins/esi/lib/ComponentBase.h | 2 +- plugins/esi/lib/DocNode.h | 2 +- plugins/esi/lib/EsiGunzip.h | 2 +- plugins/esi/lib/EsiGzip.h | 2 +- plugins/esi/lib/Expression.h | 4 +- plugins/esi/lib/FailureInfo.h | 4 +- plugins/esi/lib/Utils.h | 2 +- plugins/esi/lib/Variables.h | 2 +- plugins/experimental/cachekey/configs.h | 12 +- plugins/experimental/cachekey/pattern.h | 4 +- .../collapsed_connection/MurmurHash3.h | 2 +- .../collapsed_connection/P_collapsed_connection.h | 2 +- plugins/experimental/geoip_acl/acl.h | 12 +- plugins/experimental/inliner/cache-handler.h | 2 +- plugins/experimental/inliner/cache.h | 2 +- plugins/experimental/inliner/chunk-decoder.h | 2 +- plugins/experimental/inliner/fetcher.h | 2 +- plugins/experimental/inliner/inliner-handler.h | 6 +- plugins/experimental/inliner/ts.h | 10 +- plugins/experimental/inliner/vconnection.h | 2 +- plugins/experimental/money_trace/money_trace.h | 2 +- plugins/experimental/mp4/mp4_common.h | 8 +- plugins/experimental/mp4/mp4_meta.h | 10 +- plugins/experimental/multiplexer/chunk-decoder.h | 2 +- plugins/experimental/multiplexer/dispatch.h | 2 +- plugins/experimental/multiplexer/fetcher.h | 2 +- .../experimental/multiplexer/original-request.h | 2 +- plugins/experimental/multiplexer/ts.h | 2 +- plugins/experimental/mysql_remap/lib/dictionary.h | 6 +- plugins/experimental/mysql_remap/lib/iniparser.h | 6 +- .../server_push_preload/server_push_preload.cc | 4 +- plugins/experimental/sslheaders/sslheaders.h | 2 +- plugins/experimental/tls_bridge/tls_bridge.cc | 2 +- plugins/header_rewrite/condition.h | 2 +- plugins/header_rewrite/conditions.h | 144 +++++++-------- plugins/header_rewrite/operator.h | 6 +- plugins/header_rewrite/operators.h | 76 ++++---- plugins/header_rewrite/statement.h | 2 +- plugins/s3_auth/aws_auth_v4_wrap.h | 14 +- plugins/s3_auth/unit-tests/test_aws_auth_v4.cc | 2 +- plugins/xdebug/xdebug.cc | 2 +- proxy/ControlMatcher.h | 10 +- proxy/CoreUtils.h | 8 +- proxy/IPAllow.h | 2 +- proxy/InkAPIInternal.h | 2 +- proxy/InkIOCoreAPI.cc | 2 +- proxy/ParentConsistentHash.h | 9 +- proxy/ParentRoundRobin.h | 9 +- proxy/ParentSelection.h | 2 +- proxy/PluginVC.h | 60 +++---- proxy/ProtocolProbeSessionAccept.h | 6 +- proxy/Show.h | 2 +- proxy/StatPages.h | 2 +- proxy/TransformInternal.h | 10 +- proxy/api/ts/InkAPIPrivateIOCore.h | 20 +-- proxy/hdrs/HTTP.h | 2 +- proxy/hdrs/HdrHeap.h | 2 +- proxy/hdrs/HdrToken.h | 2 +- proxy/http/HttpCacheSM.h | 2 +- proxy/http/HttpConfig.h | 8 +- proxy/http/HttpPages.h | 2 +- proxy/http/HttpServerSession.h | 12 +- proxy/http/HttpSessionAccept.h | 6 +- proxy/http/remap/RemapPlugins.h | 2 +- proxy/http/remap/RemapProcessor.h | 4 +- proxy/http/remap/UrlRewrite.h | 2 +- proxy/http2/Http2ClientSession.h | 4 +- proxy/http2/Http2SessionAccept.h | 6 +- proxy/http2/Http2Stream.h | 12 +- proxy/http2/HuffmanCodec.h | 4 +- proxy/logging/Log.h | 2 +- proxy/logging/LogCollationAccept.h | 2 +- proxy/logging/LogCollationClientSM.h | 2 +- proxy/logging/LogConfig.h | 2 +- proxy/logging/LogFieldAliasMap.h | 14 +- proxy/logging/LogFile.h | 8 +- proxy/logging/LogFilter.h | 26 +-- proxy/logging/LogFormat.h | 2 +- proxy/logging/LogHost.h | 4 +- proxy/logging/LogObject.h | 2 +- proxy/logging/LogUtils.h | 2 +- tests/gold_tests/cache/cache-control.test.py | 106 +++++++++++ .../cache/gold/cache_and_req_body-hit.gold | 11 ++ .../cache/gold/cache_and_req_body-miss.gold | 11 ++ tests/gold_tests/cache/gold/cache_hit_stale.gold | 11 ++ tests/gold_tests/cache/gold/cache_no_cache.gold | 12 ++ tests/gold_tests/cache/gold/cache_no_cc.gold | 10 ++ .../{gzip/gzip.config => compress/compress.config} | 0 .../{gzip/gzip.gold => compress/compress.gold} | 194 +++++++++++++-------- .../gzip.test.py => compress/compress.test.py} | 62 ++++--- .../gzip2.config => compress/compress2.config} | 0 .../compress_observer.py} | 6 +- .../pluginTest/{gzip => compress}/greplog.sh | 2 +- tests/gold_tests/pluginTest/gzip/gzip_userver.gold | 19 -- 204 files changed, 903 insertions(+), 703 deletions(-) diff --cc iocore/net/P_UnixUDPConnection.h index eee748f,668f9f3..9e3c2f2 --- a/iocore/net/P_UnixUDPConnection.h +++ b/iocore/net/P_UnixUDPConnection.h @@@ -52,11 -52,11 +52,11 @@@ public EventIO ep; UnixUDPConnection(int the_fd); - virtual ~UnixUDPConnection(); + ~UnixUDPConnection() override; private: - int m_errno; + int m_errno = 0; - virtual void UDPConnection_is_abstract(){}; + void UDPConnection_is_abstract() override{}; }; TS_INLINE -- To stop receiving notification emails like this one, please contact [email protected].
