Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6c2c3128 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6c2c3128 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6c2c3128 Branch: refs/heads/master Commit: 6c2c31285cff51a405d2f3533780460b62fa06d5 Parents: 4933bad bcec70d Author: Brian Geffon <[email protected]> Authored: Thu Jul 16 19:20:59 2015 -0700 Committer: Brian Geffon <[email protected]> Committed: Thu Jul 16 19:20:59 2015 -0700 ---------------------------------------------------------------------- build/plugins.mk | 1 - ci/jenkins/bin/in_tree.sh | 3 +- ci/jenkins/bin/out_of_tree.sh | 6 +- cmd/traffic_cop/Makefile.am | 2 - cmd/traffic_cop/traffic_cop.cc | 14 ++- cmd/traffic_crashlog/Makefile.am | 2 - cmd/traffic_crashlog/traffic_crashlog.cc | 9 +- cmd/traffic_crashlog/traffic_crashlog.h | 5 +- cmd/traffic_ctl/Makefile.am | 2 - cmd/traffic_ctl/traffic_ctl.h | 9 +- cmd/traffic_layout/Makefile.am | 2 - cmd/traffic_layout/traffic_layout.cc | 9 +- cmd/traffic_line/Makefile.am | 2 - cmd/traffic_line/traffic_line.cc | 12 +- cmd/traffic_manager/AddConfigFilesHere.cc | 4 +- cmd/traffic_manager/Makefile.am | 5 +- cmd/traffic_manager/MgmtHandlers.cc | 5 +- cmd/traffic_manager/StatProcessor.cc | 3 +- cmd/traffic_manager/StatProcessor.h | 4 +- cmd/traffic_manager/StatType.cc | 6 +- cmd/traffic_manager/StatXML.cc | 2 +- cmd/traffic_manager/StatXML.h | 2 +- cmd/traffic_manager/WebOverview.cc | 6 +- cmd/traffic_manager/WebOverview.h | 8 +- cmd/traffic_manager/traffic_manager.cc | 12 +- cmd/traffic_top/Makefile.am | 2 - cmd/traffic_top/traffic_top.cc | 2 +- cmd/traffic_via/Makefile.am | 2 - cmd/traffic_via/traffic_via.cc | 13 +-- cmd/traffic_wccp/Makefile.am | 1 - cmd/traffic_wccp/wccp_client.cc | 4 +- example/session-1/session-1.c | 2 +- example/version/version.c | 3 +- iocore/aio/I_AIO.h | 2 +- iocore/aio/Makefile.am | 4 +- iocore/aio/test_AIO.cc | 2 +- iocore/cache/Cache.cc | 4 +- iocore/cache/CacheDir.cc | 4 +- iocore/cache/CacheHosting.cc | 4 +- iocore/cache/CacheHttp.cc | 2 +- iocore/cache/I_Cache.h | 2 +- iocore/cache/I_CacheDefs.h | 2 + iocore/cache/I_Store.h | 2 +- iocore/cache/Makefile.am | 2 - iocore/cache/P_Cache.h | 4 +- iocore/cache/P_CacheInternal.h | 3 +- iocore/cache/RamCacheCLFUS.cc | 1 + iocore/cache/Store.cc | 7 +- iocore/cluster/ClusterMachine.cc | 5 +- iocore/cluster/Makefile.am | 2 - iocore/cluster/P_Cluster.h | 2 +- iocore/dns/Makefile.am | 2 - iocore/dns/P_DNS.h | 2 +- iocore/dns/P_DNSProcessor.h | 1 - iocore/dns/SRV.h | 2 +- iocore/dns/SplitDNS.cc | 7 +- iocore/eventsystem/IOBuffer.cc | 2 +- iocore/eventsystem/I_Action.h | 2 +- iocore/eventsystem/I_Continuation.h | 3 +- iocore/eventsystem/I_EThread.h | 4 +- iocore/eventsystem/I_Event.h | 2 +- iocore/eventsystem/I_EventProcessor.h | 2 +- iocore/eventsystem/I_EventSystem.h | 2 +- iocore/eventsystem/I_IOBuffer.h | 8 +- iocore/eventsystem/I_Lock.h | 3 +- iocore/eventsystem/I_PriorityEventQueue.h | 2 +- iocore/eventsystem/I_Processor.h | 2 +- iocore/eventsystem/I_ProtectedQueue.h | 2 +- iocore/eventsystem/I_ProxyAllocator.h | 2 +- iocore/eventsystem/I_SocketManager.h | 2 +- iocore/eventsystem/I_Thread.h | 3 +- iocore/eventsystem/I_VConnection.h | 2 +- iocore/eventsystem/I_VIO.h | 4 +- iocore/eventsystem/Lock.cc | 2 +- iocore/eventsystem/Makefile.am | 4 +- iocore/eventsystem/P_EventSystem.h | 2 +- iocore/eventsystem/P_Freer.h | 2 +- iocore/eventsystem/P_IOBuffer.h | 6 +- iocore/eventsystem/P_UnixEventProcessor.h | 2 + iocore/eventsystem/P_UnixSocketManager.h | 3 +- iocore/eventsystem/SocketManager.cc | 2 +- iocore/eventsystem/Thread.cc | 1 + iocore/eventsystem/UnixEventProcessor.cc | 2 +- iocore/eventsystem/test_Buffer.cc | 3 +- iocore/eventsystem/test_Event.cc | 2 +- iocore/hostdb/HostDB.cc | 59 +++++----- iocore/hostdb/I_HostDBProcessor.h | 7 +- iocore/hostdb/Makefile.am | 2 - iocore/hostdb/MultiCache.cc | 6 +- iocore/hostdb/P_HostDB.h | 2 +- iocore/hostdb/P_HostDBProcessor.h | 3 +- iocore/net/Connection.cc | 2 +- iocore/net/I_Net.h | 2 +- iocore/net/I_NetVConnection.h | 3 +- iocore/net/I_UDPNet.h | 4 +- iocore/net/Makefile.am | 2 - iocore/net/P_Connection.h | 2 +- iocore/net/P_Net.h | 2 +- iocore/net/P_NetAccept.h | 2 +- iocore/net/P_NetVCTest.h | 2 +- iocore/net/P_SSLClientUtils.h | 4 +- iocore/net/P_SSLConfig.h | 1 + iocore/net/P_SSLNetAccept.h | 2 +- iocore/net/P_SSLNetProcessor.h | 2 +- iocore/net/P_SSLNetVConnection.h | 4 +- iocore/net/P_SSLNextProtocolSet.h | 2 +- iocore/net/P_SSLUtils.h | 4 +- iocore/net/P_UnixNet.h | 2 +- iocore/net/P_UnixNetState.h | 2 +- iocore/net/P_UnixNetVConnection.h | 2 +- iocore/net/P_UnixPollDescriptor.h | 2 +- iocore/net/SSLCertLookup.cc | 8 +- iocore/net/SSLClientUtils.cc | 6 +- iocore/net/SSLConfig.cc | 4 +- iocore/net/SSLDynlock.cc | 7 +- iocore/net/SSLInternal.cc | 2 +- iocore/net/SSLNetAccept.cc | 2 +- iocore/net/SSLNetProcessor.cc | 4 +- iocore/net/SSLNetVConnection.cc | 3 +- iocore/net/SSLNextProtocolSet.cc | 6 +- iocore/net/SSLSessionCache.h | 10 +- iocore/net/SSLUtils.cc | 8 +- iocore/net/Socks.cc | 4 +- iocore/net/UnixNetPages.cc | 2 +- iocore/net/UnixNetProcessor.cc | 2 + iocore/net/UnixNetVConnection.cc | 3 +- iocore/net/test_I_UDPNet.cc | 2 +- iocore/net/test_P_UDPNet.cc | 2 +- iocore/utils/I_Machine.h | 2 + iocore/utils/Machine.cc | 5 +- iocore/utils/Makefile.am | 2 - lib/atscppapi/src/Makefile.am | 8 +- lib/atscppapi/src/Transaction.cc | 2 +- lib/records/I_RecCore.h | 2 +- lib/records/I_RecDefs.h | 4 +- lib/records/I_RecMutex.h | 4 +- lib/records/Makefile.am | 4 +- lib/records/P_RecCore.cc | 11 +- lib/records/P_RecCore.h | 10 +- lib/records/P_RecUtils.h | 4 +- lib/records/RecConfigParse.cc | 13 ++- lib/records/RecCore.cc | 6 +- lib/records/RecFile.cc | 3 +- lib/records/RecLocal.cc | 4 +- lib/records/RecMessage.cc | 6 +- lib/records/RecMutex.cc | 2 +- lib/records/RecProcess.cc | 3 +- lib/records/RecUtils.cc | 4 +- lib/records/test_RecProcess.i | 2 +- lib/ts/Arena.cc | 6 +- lib/ts/Bitops.cc | 2 +- lib/ts/CompileParseRules.cc | 4 +- lib/ts/ConsistentHash.cc | 2 +- lib/ts/CryptoHash.h | 9 +- lib/ts/Diags.cc | 16 +-- lib/ts/EventNotify.cc | 6 +- lib/ts/Hash.cc | 2 +- lib/ts/HashFNV.cc | 2 +- lib/ts/HashMD5.cc | 2 +- lib/ts/HashSip.cc | 2 +- lib/ts/HostLookup.cc | 12 +- lib/ts/IpMap.cc | 2 +- lib/ts/Layout.cc | 8 +- lib/ts/MMH.cc | 6 +- lib/ts/Makefile.am | 1 - lib/ts/MatcherUtils.cc | 8 +- lib/ts/MatcherUtils.h | 4 +- lib/ts/MimeTable.cc | 3 +- lib/ts/ParseRules.cc | 3 +- lib/ts/RawHashTable.cc | 2 +- lib/ts/RbTree.cc | 2 +- lib/ts/Regex.cc | 6 +- lib/ts/Regression.cc | 5 +- lib/ts/Regression.h | 4 +- lib/ts/SimpleTokenizer.h | 1 + lib/ts/TestBox.h | 3 +- lib/ts/TestHttpHeader.cc | 2 +- lib/ts/TextBuffer.cc | 6 +- lib/ts/Tokenizer.cc | 10 +- lib/ts/Vec.cc | 2 +- lib/ts/Vec.h | 2 +- lib/ts/Version.cc | 4 +- lib/ts/X509HostnameValidator.cc | 2 +- lib/ts/X509HostnameValidator.h | 2 + lib/ts/hugepages.cc | 4 +- lib/ts/ink_args.cc | 8 +- lib/ts/ink_assert.cc | 8 +- lib/ts/ink_auth_api.cc | 6 +- lib/ts/ink_base64.cc | 5 +- lib/ts/ink_cap.cc | 8 +- lib/ts/ink_code.cc | 8 +- lib/ts/ink_defs.cc | 4 +- lib/ts/ink_error.cc | 6 +- lib/ts/ink_file.cc | 5 +- lib/ts/ink_hash_table.cc | 6 +- lib/ts/ink_hrtime.cc | 6 +- lib/ts/ink_inet.cc | 7 +- lib/ts/ink_memory.cc | 6 +- lib/ts/ink_mutex.cc | 6 +- lib/ts/ink_platform.h | 2 - lib/ts/ink_queue.cc | 16 +-- lib/ts/ink_queue_utils.cc | 6 +- lib/ts/ink_rand.cc | 3 +- lib/ts/ink_res_init.cc | 12 +- lib/ts/ink_res_mkquery.cc | 8 +- lib/ts/ink_resource.cc | 6 +- lib/ts/ink_rwlock.cc | 4 +- lib/ts/ink_sock.cc | 5 +- lib/ts/ink_sprintf.cc | 2 +- lib/ts/ink_stack_trace.cc | 5 +- lib/ts/ink_string++.cc | 6 +- lib/ts/ink_string.cc | 3 +- lib/ts/ink_sys_control.cc | 6 +- lib/ts/ink_syslog.cc | 2 +- lib/ts/ink_thread.cc | 4 +- lib/ts/ink_time.cc | 10 +- lib/ts/libts.h | 111 ------------------- lib/ts/llqueue.cc | 6 +- lib/ts/load_http_hdr.cc | 2 +- lib/ts/lockfile.cc | 4 +- lib/ts/signals.cc | 9 +- lib/ts/test_Map.cc | 2 +- lib/ts/test_Vec.cc | 4 +- lib/ts/test_X509HostnameValidator.cc | 4 + lib/ts/test_arena.cc | 2 +- lib/ts/test_freelist.cc | 4 +- lib/ts/test_geometry.cc | 3 +- lib/tsconfig/Makefile.am | 4 +- lib/wccp/Makefile.am | 1 - lib/wccp/Wccp.h | 4 +- lib/wccp/WccpEndPoint.cc | 4 +- lib/wccp/WccpMsg.cc | 4 +- lib/wccp/WccpStatic.cc | 4 +- mgmt/Alarms.cc | 7 +- mgmt/Alarms.h | 4 +- mgmt/BaseManager.cc | 4 +- mgmt/BaseManager.h | 7 +- mgmt/FileManager.cc | 5 +- mgmt/FileManager.h | 4 +- mgmt/LocalManager.cc | 9 +- mgmt/Makefile.am | 2 - mgmt/MgmtDefs.h | 4 +- mgmt/MultiFile.cc | 19 ++-- mgmt/ProcessManager.cc | 7 +- mgmt/ProcessManager.h | 4 +- mgmt/ProxyConfig.cc | 2 +- mgmt/ProxyConfig.h | 3 +- mgmt/RecordsConfig.cc | 2 +- mgmt/RecordsConfigUtils.cc | 4 +- mgmt/Rollback.cc | 10 +- mgmt/Rollback.h | 10 +- mgmt/WebMgmtUtils.cc | 8 +- mgmt/WebMgmtUtils.h | 4 +- mgmt/api/APITestCliRemote.cc | 6 +- mgmt/api/CfgContextDefs.h | 2 +- mgmt/api/CfgContextImpl.cc | 4 +- mgmt/api/CfgContextImpl.h | 2 +- mgmt/api/CfgContextManager.cc | 4 +- mgmt/api/CfgContextUtils.cc | 7 +- mgmt/api/CoreAPI.cc | 12 +- mgmt/api/CoreAPI.h | 4 +- mgmt/api/CoreAPIRemote.cc | 10 +- mgmt/api/CoreAPIShared.cc | 5 +- mgmt/api/EventCallback.cc | 4 +- mgmt/api/EventCallback.h | 2 +- mgmt/api/EventControlMain.cc | 3 +- mgmt/api/GenericParser.cc | 3 +- mgmt/api/GenericParser.h | 6 +- mgmt/api/INKMgmtAPI.cc | 8 +- mgmt/api/Makefile.am | 2 - mgmt/api/NetworkMessage.cc | 8 +- mgmt/api/NetworkUtilsLocal.cc | 6 +- mgmt/api/NetworkUtilsLocal.h | 2 +- mgmt/api/NetworkUtilsRemote.cc | 12 +- mgmt/api/TSControlMain.cc | 3 +- mgmt/cluster/ClusterCom.cc | 8 +- mgmt/cluster/ClusterCom.h | 4 +- mgmt/cluster/Makefile.am | 2 - mgmt/cluster/VMap.cc | 4 +- mgmt/cluster/VMap.h | 4 +- mgmt/utils/ExpandingArray.cc | 4 +- mgmt/utils/Makefile.am | 2 - mgmt/utils/MgmtHashTable.h | 6 +- mgmt/utils/MgmtMarshall.cc | 4 +- mgmt/utils/MgmtSocket.cc | 2 +- mgmt/utils/MgmtSocket.h | 2 +- mgmt/utils/MgmtUtils.cc | 5 +- mgmt/utils/MgmtUtils.h | 4 +- mgmt/utils/test_marshall.cc | 6 +- plugins/experimental/ats_pagespeed/gzip/gzip.cc | 2 +- plugins/experimental/ats_pagespeed/gzip/misc.cc | 2 +- .../experimental/channel_stats/channel_stats.cc | 4 +- .../experimental/channel_stats/debug_macros.h | 2 +- proxy/AbstractBuffer.cc | 4 +- proxy/AbstractBuffer.h | 5 +- proxy/CacheControl.cc | 4 +- proxy/CacheControl.h | 1 + proxy/ControlBase.cc | 12 +- proxy/ControlBase.h | 3 +- proxy/ControlMatcher.cc | 7 +- proxy/ControlMatcher.h | 12 +- proxy/CoreUtils.cc | 4 +- proxy/CoreUtils.h | 2 +- proxy/Crash.cc | 6 +- proxy/EventName.cc | 2 +- proxy/FetchSM.cc | 2 +- proxy/ICP.cc | 2 +- proxy/ICP.h | 2 +- proxy/ICPConfig.cc | 5 +- proxy/IPAllow.cc | 2 +- proxy/InkAPI.cc | 5 +- proxy/InkAPIInternal.h | 2 +- proxy/InkAPITest.cc | 6 +- proxy/InkAPITestTool.cc | 2 +- proxy/InkIOCoreAPI.cc | 2 +- proxy/InkPool_r.h | 2 +- proxy/Main.cc | 15 ++- proxy/Main.h | 7 +- proxy/Makefile.am | 2 - proxy/ParentSelection.cc | 4 +- proxy/ParentSelection.h | 5 +- proxy/Plugin.cc | 10 +- proxy/Plugin.h | 2 +- proxy/PluginVC.cc | 2 +- proxy/PluginVC.h | 2 +- proxy/ProxyClientSession.h | 2 +- proxy/RegressionSM.h | 2 + proxy/ReverseProxy.cc | 6 +- proxy/ReverseProxy.h | 4 +- proxy/SocksProxy.cc | 2 +- proxy/StatPages.cc | 4 +- proxy/StatSystem.cc | 2 +- proxy/StatSystem.h | 12 +- proxy/TestClock.cc | 2 +- proxy/TestClusterHash.cc | 2 +- proxy/TestDNS.cc | 2 +- proxy/TestPreProc.cc | 4 +- proxy/TestRegex.cc | 2 +- proxy/Transform.cc | 2 +- proxy/congest/Congestion.cc | 2 +- proxy/congest/Congestion.h | 2 +- proxy/congest/CongestionDB.cc | 2 +- proxy/congest/CongestionTest.cc | 2 +- proxy/congest/Makefile.am | 2 - proxy/hdrs/HTTP.cc | 8 +- proxy/hdrs/HTTP.h | 6 +- proxy/hdrs/HdrHeap.cc | 2 +- proxy/hdrs/HdrHeap.h | 8 +- proxy/hdrs/HdrTSOnly.cc | 2 +- proxy/hdrs/HdrTest.cc | 8 +- proxy/hdrs/HdrTest.h | 2 +- proxy/hdrs/HdrToken.cc | 9 +- proxy/hdrs/HdrToken.h | 14 +-- proxy/hdrs/HdrUtils.cc | 2 +- proxy/hdrs/HdrUtils.h | 2 +- proxy/hdrs/HttpCompat.cc | 2 +- proxy/hdrs/HttpCompat.h | 6 +- proxy/hdrs/MIME.cc | 6 +- proxy/hdrs/MIME.h | 6 +- proxy/hdrs/Makefile.am | 4 +- proxy/hdrs/URL.cc | 6 +- proxy/hdrs/URL.h | 8 +- proxy/hdrs/load_http_hdr.cc | 4 +- proxy/hdrs/test_header.cc | 4 +- proxy/hdrs/test_urlhash.cc | 4 +- proxy/http/HttpBodyFactory.cc | 6 +- proxy/http/HttpBodyFactory.h | 4 +- proxy/http/HttpClientSession.cc | 4 +- proxy/http/HttpClientSession.h | 3 +- proxy/http/HttpConfig.cc | 2 +- proxy/http/HttpConfig.h | 5 +- proxy/http/HttpConnectionCount.h | 6 +- proxy/http/HttpPages.h | 4 +- proxy/http/HttpProxyServerMain.cc | 4 +- proxy/http/HttpSM.h | 2 +- proxy/http/HttpServerSession.cc | 4 +- proxy/http/HttpSessionAccept.h | 2 +- proxy/http/HttpTransact.cc | 13 ++- proxy/http/HttpTransact.h | 4 +- proxy/http/HttpTransactCache.cc | 4 +- proxy/http/HttpTransactCache.h | 2 +- proxy/http/HttpTransactHeaders.cc | 2 +- proxy/http/HttpTunnel.cc | 4 +- proxy/http/HttpTunnel.h | 2 +- proxy/http/HttpUpdateTester.cc | 4 +- proxy/http/Makefile.am | 2 - proxy/http/RegressionHttpTransact.cc | 2 +- proxy/http/TestHttpTransact.cc | 2 +- proxy/http/remap/AclFiltering.h | 2 +- proxy/http/remap/Makefile.am | 2 - proxy/http/remap/RemapConfig.cc | 10 +- proxy/http/remap/RemapPluginInfo.cc | 2 + proxy/http/remap/RemapPluginInfo.h | 2 +- proxy/http/remap/RemapPlugins.h | 2 +- proxy/http/remap/UrlMapping.cc | 4 +- proxy/http/remap/UrlMapping.h | 5 +- proxy/http/remap/UrlMappingPathIndex.h | 4 +- proxy/http/remap/UrlRewrite.cc | 2 +- proxy/http/remap/UrlRewrite.h | 4 +- proxy/http/testheaders.cc | 2 +- proxy/http2/HPACK.h | 4 +- proxy/http2/HTTP2.cc | 4 +- proxy/http2/HTTP2.h | 4 +- proxy/http2/Http2ClientSession.cc | 1 + proxy/http2/Http2SessionAccept.h | 2 +- proxy/http2/HuffmanCodec.cc | 4 +- proxy/http2/Makefile.am | 2 - proxy/logcat.cc | 5 +- proxy/logging/Log.cc | 6 +- proxy/logging/Log.h | 5 +- proxy/logging/LogAccess.cc | 2 +- proxy/logging/LogAccess.h | 4 +- proxy/logging/LogAccessHttp.cc | 2 +- proxy/logging/LogAccessHttp.h | 2 +- proxy/logging/LogAccessICP.cc | 2 +- proxy/logging/LogBuffer.cc | 2 +- proxy/logging/LogBuffer.h | 2 +- proxy/logging/LogCollationAccept.cc | 2 +- proxy/logging/LogCollationClientSM.cc | 2 +- proxy/logging/LogCollationHostSM.cc | 2 +- proxy/logging/LogConfig.cc | 12 +- proxy/logging/LogConfig.h | 2 +- proxy/logging/LogField.cc | 2 +- proxy/logging/LogField.h | 3 +- proxy/logging/LogFieldAliasMap.cc | 5 +- proxy/logging/LogFieldAliasMap.h | 6 +- proxy/logging/LogFile.cc | 4 +- proxy/logging/LogFile.h | 2 +- proxy/logging/LogFilter.cc | 6 +- proxy/logging/LogFilter.h | 4 +- proxy/logging/LogFormat.cc | 6 +- proxy/logging/LogFormat.h | 2 +- proxy/logging/LogHost.cc | 2 +- proxy/logging/LogObject.cc | 6 +- proxy/logging/LogObject.h | 2 +- proxy/logging/LogSock.cc | 2 + proxy/logging/LogSock.h | 2 +- proxy/logging/LogStandalone.cc | 7 +- proxy/logging/LogUtils.cc | 3 +- proxy/logging/LogUtils.h | 4 +- proxy/logging/Makefile.am | 2 - proxy/logstats.cc | 13 ++- proxy/sac.cc | 5 +- proxy/shared/DiagsConfig.cc | 6 +- proxy/shared/DiagsConfig.h | 2 +- proxy/shared/Error.cc | 4 +- proxy/shared/Error.h | 4 +- proxy/shared/InkXml.cc | 4 +- proxy/shared/InkXml.h | 2 +- proxy/shared/Makefile.am | 5 +- proxy/shared/UglyLogStubs.cc | 2 +- proxy/spdy/Makefile.am | 2 - proxy/spdy/SpdyCommon.h | 2 +- proxy/test_xml_parser.cc | 2 +- tools/Makefile.am | 1 - tools/http_load/http_load.c | 2 +- tools/jtest/jtest.cc | 16 +-- 457 files changed, 1085 insertions(+), 1004 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6c2c3128/iocore/hostdb/HostDB.cc ----------------------------------------------------------------------
