Merge branch 'master' into sphinx-docs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f032bbcd Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f032bbcd Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f032bbcd Branch: refs/heads/sphinx-docs Commit: f032bbcd129bfc473fef857dc6783902544e76cb Parents: d9f943e 16099e8 Author: James Peach <[email protected]> Authored: Sat May 4 08:29:27 2013 -0700 Committer: James Peach <[email protected]> Committed: Sat May 4 08:29:27 2013 -0700 ---------------------------------------------------------------------- .gitignore | 2 + CHANGES | 233 +- CRUFT.txt | 34 + INSTALL | 6 +- Makefile.am | 29 +- STATUS | 7 +- Vagrantfile | 108 + build/ax_compare_version.m4 | 177 + build/ax_compiler_vendor.m4 | 84 + build/ax_lib_curl.m4 | 38 + build/ax_path_generic.m4 | 164 + build/ax_with_curses.m4 | 518 + build/common.m4 | 12 +- build/plugins.mk | 37 + ci/rat-excludes.txt | 13 + ci/regression | 19 +- config.layout | 20 + configure.ac | 389 +- contrib/manifests/debian.pp | 32 + contrib/manifests/omnios.sh | 39 + contrib/manifests/redhat.pp | 32 + .../perl/AdminClient/lib/Apache/TS/AdminClient.pm | 5 - .../ConfigMgmt/lib/Apache/TS/Config/Records.pm | 131 +- contrib/python/compare_RecordsConfigcc.py | 87 + contrib/python/compare_records_config.py | 67 + contrib/tstop/.gitignore | 1 - contrib/tstop/Makefile | 5 - contrib/tstop/README | 4 - contrib/tstop/stats.h | 392 - contrib/tstop/tstop.cc | 379 - cop/TrafficCop.cc | 49 +- doc/sdk/TSPluginInit.3 | 2 +- doc/sdk/TSTrafficServerVersionGet.3 | 2 +- example/Makefile.am | 5 +- example/add-header/add-header.c | 6 +- example/app-template/app-template.cc | 6 +- example/app-template/records.config.in | 1 + example/append-transform/append-transform.c | 8 +- example/basic-auth/basic-auth.c | 14 +- example/blacklist-1/blacklist-1.c | 10 +- example/bnull-transform/bnull-transform.c | 10 +- example/cache-scan/cache-scan.cc | 13 +- example/hello/hello.c | 6 +- example/null-transform/null-transform.c | 12 +- example/output-header/output-header.c | 8 +- example/prefetch/test-hns-plugin.c | 2 +- example/protocol/Protocol.c | 3 +- example/protocol/TxnSM.c | 18 +- example/query-remap/query-remap.c | 13 +- example/remap/remap.cc | 26 +- example/replace-header/replace-header.c | 12 +- example/response-header-1/response-header-1.c | 11 +- example/server-transform/server-transform.c | 35 +- example/session-1/session-1.c | 7 +- example/thread-1/thread-1.c | 8 +- example/thread-pool/psi.c | 15 +- example/thread-pool/thread.c | 5 +- iocore/aio/AIO.cc | 150 +- iocore/aio/I_AIO.h | 85 +- iocore/aio/Inline.cc | 3 +- iocore/aio/Makefile.am | 26 + iocore/aio/NTAIO.cc | 168 - iocore/aio/P_AIO.h | 66 +- iocore/aio/test_AIO.cc | 522 + iocore/aio/test_AIO.i | 527 - iocore/aio/test_AIO.sample | 2 + iocore/aio/test_I_AIO.cc | 25 - iocore/aio/test_P_AIO.cc | 25 - iocore/cache/Cache.cc | 143 +- iocore/cache/CacheDir.cc | 36 +- iocore/cache/CacheDisk.cc | 2 +- iocore/cache/CacheLink.cc | 2 +- iocore/cache/CacheRead.cc | 10 +- iocore/cache/CacheVol.cc | 12 +- iocore/cache/CacheWrite.cc | 123 +- iocore/cache/I_Cache.h | 4 - iocore/cache/I_Store.h | 15 +- iocore/cache/Inline.cc | 3 +- iocore/cache/P_Cache.h | 5 - iocore/cache/P_CacheDir.h | 2 +- iocore/cache/P_CacheInternal.h | 31 +- iocore/cache/P_CacheVol.h | 6 +- iocore/cache/Store.cc | 59 +- iocore/cluster/ClusterAPI.cc | 2 +- iocore/cluster/ClusterHandler.cc | 2 +- iocore/cluster/ClusterHandlerBase.cc | 103 +- iocore/cluster/ClusterHash.cc | 2 - iocore/cluster/ClusterMachine.cc | 9 +- iocore/cluster/ClusterProcessor.cc | 2 +- iocore/cluster/ClusterVConnection.cc | 2 +- iocore/cluster/Inline.cc | 3 +- iocore/cluster/P_Cluster.h | 5 - iocore/cluster/P_ClusterCache.h | 2 +- iocore/cluster/P_ClusterHandler.h | 3 + iocore/dns/DNS.cc | 45 +- iocore/dns/DNSConnection.cc | 2 - iocore/dns/I_DNS.h | 4 - iocore/dns/Inline.cc | 3 +- iocore/dns/Makefile.am | 1 - iocore/dns/P_DNS.h | 5 - iocore/dns/SRV.cc | 161 - iocore/dns/SRV.h | 114 +- iocore/eventsystem/IOBuffer.cc | 2 - iocore/eventsystem/I_EThread.h | 2 +- iocore/eventsystem/I_EventSystem.h | 4 - iocore/eventsystem/I_IOBuffer.h | 60 +- iocore/eventsystem/I_Lock.h | 8 +- iocore/eventsystem/I_SocketManager.h | 2 +- iocore/eventsystem/I_Thread.h | 6 +- iocore/eventsystem/I_VConnection.h | 27 +- iocore/eventsystem/Inline.cc | 3 +- iocore/eventsystem/Makefile.am | 33 + iocore/eventsystem/P_EventSystem.h | 5 - iocore/eventsystem/P_IOBuffer.h | 16 +- iocore/eventsystem/P_UnixEThread.h | 2 +- iocore/eventsystem/P_UnixEventProcessor.h | 4 +- iocore/eventsystem/P_VConnection.h | 2 +- iocore/eventsystem/ProtectedQueue.cc | 2 +- iocore/eventsystem/SocketManager.cc | 2 +- iocore/eventsystem/UnixEThread.cc | 1 - iocore/eventsystem/UnixEvent.cc | 9 +- iocore/eventsystem/UnixEventProcessor.cc | 43 +- iocore/eventsystem/test_Buffer.cc | 44 +- iocore/eventsystem/test_Event.cc | 175 + iocore/eventsystem/test_Event.i | 174 - iocore/hostdb/HostDB.cc | 307 +- iocore/hostdb/I_HostDB.h | 4 - iocore/hostdb/I_HostDBProcessor.h | 158 +- iocore/hostdb/Inline.cc | 3 +- iocore/hostdb/MultiCache.cc | 139 +- iocore/hostdb/P_HostDB.h | 5 - iocore/hostdb/P_HostDBProcessor.h | 148 +- iocore/net/Connection.cc | 5 +- iocore/net/I_Net.h | 4 - iocore/net/I_NetProcessor.h | 14 +- iocore/net/I_UDPConnection.h | 13 +- iocore/net/I_UDPNet.h | 30 +- iocore/net/I_UDPPacket.h | 22 +- iocore/net/Inline.cc | 3 +- iocore/net/Net.cc | 1 - iocore/net/NetTest-http-server.c | 2 +- iocore/net/NetVCTest.cc | 9 +- iocore/net/P_InkBulkIO.h | 7 - iocore/net/P_LibBulkIO.h | 2 - iocore/net/P_Net.h | 5 - iocore/net/P_NetVCTest.h | 2 +- iocore/net/P_SSLUtils.h | 2 +- iocore/net/P_UDPConnection.h | 34 +- iocore/net/P_UDPNet.h | 197 +- iocore/net/P_UDPPacket.h | 56 +- iocore/net/P_UnixNet.h | 7 +- iocore/net/P_UnixNetVConnection.h | 8 +- iocore/net/P_UnixUDPConnection.h | 2 +- iocore/net/SSLCertLookup.cc | 4 +- iocore/net/SSLNetVConnection.cc | 12 +- iocore/net/SSLUtils.cc | 252 +- iocore/net/Socks.cc | 18 +- iocore/net/UnixConnection.cc | 1 - iocore/net/UnixNet.cc | 9 +- iocore/net/UnixNetAccept.cc | 4 +- iocore/net/UnixNetProcessor.cc | 4 +- iocore/net/UnixNetVConnection.cc | 65 +- iocore/net/UnixUDPConnection.cc | 10 +- iocore/net/UnixUDPNet.cc | 720 +-- iocore/net/test_certlookup.cc | 4 +- lib/cpp11api/Makefile.am | 2 +- lib/cpp11api/cpp11api.cc | 9 +- lib/records/I_RecCore.h | 3 +- lib/records/I_RecDefs.h | 5 +- lib/records/I_RecProcess.h | 2 +- lib/records/P_RecCore.cc | 77 +- lib/records/P_RecCore.h | 2 + lib/records/P_RecDefs.h | 6 +- lib/records/P_RecUtils.h | 10 +- lib/records/RecCore.cc | 47 +- lib/records/RecLocal.cc | 2 +- lib/records/RecMessage.cc | 4 +- lib/records/RecProcess.cc | 48 +- lib/records/RecUtils.cc | 218 +- lib/records/test_RecProcess.i | 4 +- lib/ts/Allocator.h | 2 +- lib/ts/Compatability.h | 2 +- lib/ts/CompileParseRules.cc | 1 - lib/ts/Diags.cc | 37 +- lib/ts/Diags.h | 60 +- lib/ts/HostLookup.cc | 5 +- lib/ts/INK_MD5.h | 3 +- lib/ts/IpMap.h | 2 +- lib/ts/IpMapTest.cc | 6 +- lib/ts/Layout.cc | 11 +- lib/ts/List.h | 3 +- lib/ts/MMH.h | 3 +- lib/ts/Makefile.am | 16 +- lib/ts/MimeTable.h | 2 +- lib/ts/ParseRules.h | 5 +- lib/ts/RawHashTable.cc | 1 - lib/ts/Regression.cc | 3 +- lib/ts/Resource.cc | 2 +- lib/ts/SimpleTokenizer.h | 1 - lib/ts/TestHttpHeader.cc | 1 - lib/ts/TextBuffer.cc | 2 - lib/ts/Tokenizer.cc | 2 - lib/ts/Trie.h | 2 +- lib/ts/Version.cc | 2 - lib/ts/ink_aiocb.h | 6 +- lib/ts/ink_apidefs.h | 4 + lib/ts/ink_args.cc | 1 - lib/ts/ink_assert.cc | 3 +- lib/ts/ink_assert.h | 7 +- lib/ts/ink_atomic.h | 2 +- lib/ts/ink_auth_api.h | 2 +- lib/ts/ink_base64.cc | 2 - lib/ts/ink_bool.h | 77 - lib/ts/ink_code.cc | 1 - lib/ts/ink_config.h.in | 3 + lib/ts/ink_defs.cc | 59 +- lib/ts/ink_defs.h | 109 +- lib/ts/ink_error.h | 9 - lib/ts/ink_file.cc | 17 + lib/ts/ink_file.h | 6 + lib/ts/ink_hash_table.cc | 1 - lib/ts/ink_hrtime.cc | 9 +- lib/ts/ink_llqueue.h | 2 - lib/ts/ink_lockfile.h | 2 +- lib/ts/ink_memory.cc | 8 +- lib/ts/ink_memory.h | 14 + lib/ts/ink_mutex.cc | 11 +- lib/ts/ink_mutex.h | 3 +- lib/ts/ink_port.h | 91 - lib/ts/ink_queue.cc | 54 +- lib/ts/ink_queue.h | 34 +- lib/ts/ink_queue_ext.cc | 33 +- lib/ts/ink_queue_utils.cc | 3 +- lib/ts/ink_rand.h | 2 +- lib/ts/ink_res_init.cc | 10 +- lib/ts/ink_res_mkquery.cc | 11 +- lib/ts/ink_resolver.h | 12 +- lib/ts/ink_resource.cc | 14 +- lib/ts/ink_resource.h | 3 +- lib/ts/ink_sock.cc | 2 - lib/ts/ink_sock.h | 2 +- lib/ts/ink_sprintf.cc | 1 - lib/ts/ink_stack_trace.cc | 4 +- lib/ts/ink_stack_trace.h | 2 +- lib/ts/ink_string++.cc | 1 - lib/ts/ink_string.cc | 4 +- lib/ts/ink_string.h | 6 +- lib/ts/ink_syslog.cc | 4 - lib/ts/ink_thread.cc | 1 - lib/ts/ink_thread.h | 4 +- lib/ts/ink_time.cc | 649 +-- lib/ts/ink_time.h | 86 +- lib/ts/ink_unused.h | 80 - lib/ts/libts.h | 4 - lib/ts/llqueue.cc | 1 - lib/ts/lockfile.cc | 2 +- lib/ts/mkdfa.c | 4 - lib/ts/test_Map.cc | 2 +- lib/ts/test_Vec.cc | 2 +- lib/ts/test_atomic.cc | 3 +- lib/ts/test_freelist.cc | 5 +- lib/tsconfig/Makefile.am | 4 +- lib/tsconfig/TsConfigGrammar.y | 3 +- lib/tsconfig/TsErrataUtil.cc | 7 +- lib/tsconfig/TsValue.cc | 3 +- lib/tsconfig/test-tsconfig.cc | 2 +- lib/wccp/Wccp.h | 2 +- lib/wccp/WccpEndPoint.cc | 10 +- lib/wccp/WccpMsg.cc | 4 +- lib/wccp/WccpStatic.cc | 5 +- mgmt/AddConfigFilesHere.cc | 3 - mgmt/Alarms.h | 3 +- mgmt/FileManager.cc | 2 +- mgmt/LocalManager.cc | 17 +- mgmt/LocalManager.h | 4 +- mgmt/Main.cc | 101 +- mgmt/Main.h | 5 - mgmt/Makefile.am | 4 +- mgmt/MgmtDefs.h | 2 +- mgmt/MultiFile.cc | 3 +- mgmt/ProcessManager.cc | 6 +- mgmt/ProcessManager.h | 19 +- mgmt/ProxyConfig.h | 5 +- mgmt/RecordsConfig.cc | 61 +- mgmt/Rollback.h | 3 +- mgmt/api/CfgContextUtils.cc | 70 +- mgmt/api/CfgContextUtils.h | 2 +- mgmt/api/CoreAPI.cc | 17 +- mgmt/api/CoreAPI.h | 2 +- mgmt/api/GenericParser.h | 1 - mgmt/api/INKMgmtAPI.cc | 18 +- mgmt/api/NetworkUtilsDefs.h | 3 +- mgmt/api/NetworkUtilsLocal.h | 2 +- mgmt/api/TSControlMain.cc | 20 +- mgmt/api/TSControlMain.h | 2 +- mgmt/api/include/mgmtapi.h | 5 +- mgmt/api/remote/APITestCliRemote.cc | 5 +- mgmt/api/remote/CoreAPIRemote.cc | 9 +- mgmt/api/remote/NetworkUtilsRemote.cc | 3 +- mgmt/api/remote/NetworkUtilsRemote.h | 4 +- mgmt/cli/CliCreateCommands.cc | 2 +- mgmt/cli/CliMgmtUtils.cc | 2 +- mgmt/cli/CliMgmtUtils.h | 2 +- mgmt/cli/ConfigCmd.cc | 36 +- mgmt/cli/TrafficLine.cc | 19 +- mgmt/cli/UtilCmds.cc | 1 + mgmt/cli/cliAppInit.cc | 10 +- mgmt/cli/cliMain.cc | 3 +- mgmt/cli/cliParseArg.cc | 33 +- mgmt/cli/createArgument.cc | 2 +- mgmt/cli/createArgument.h | 2 +- mgmt/cli/createCommand.cc | 2 +- mgmt/cli/definitions.h | 3 - mgmt/cli/hashtable.cc | 1 + mgmt/cli/processArgument.cc | 1 + mgmt/cluster/ClusterCom.cc | 59 +- mgmt/cluster/ClusterCom.h | 2 +- mgmt/cluster/VMap.cc | 343 +- mgmt/cluster/VMap.h | 13 +- mgmt/preparse/IPRange.cc | 2 - mgmt/preparse/IPRange.h | 2 +- mgmt/preparse/SocksParser.cc | 1 - mgmt/stats/StatProcessor.cc | 12 +- mgmt/stats/StatProcessor.h | 2 +- mgmt/stats/StatType.cc | 455 +- mgmt/stats/StatType.h | 58 +- mgmt/tools/ConfigAPI.cc | 6 +- mgmt/tools/ConfigAPI.h | 4 - mgmt/tools/SysAPI.cc | 24 +- mgmt/tools/SysAPI.h | 4 - mgmt/utils/EnvBlock.cc | 1 - mgmt/utils/ExpandingArray.cc | 1 - mgmt/utils/ExpandingArray.h | 2 - mgmt/utils/Makefile.am | 2 - mgmt/utils/MgmtSchema.h | 2 - mgmt/utils/MgmtUtils.cc | 8 +- mgmt/utils/MgmtUtils.h | 1 - mgmt/utils/WebMgmtUtils.cc | 43 + mgmt/utils/WebMgmtUtils.h | 3 +- mgmt/utils/XmlUtils.cc | 1 + mgmt/web2/WebCompatibility.h | 2 +- mgmt/web2/WebGlobals.h | 1 - mgmt/web2/WebHttp.cc | 2 - mgmt/web2/WebHttpMessage.cc | 3 +- mgmt/web2/WebHttpMessage.h | 1 - mgmt/web2/WebOverview.cc | 870 +-- mgmt/web2/WebOverview.h | 39 +- mgmt/web2/WebUtils.cc | 1 - plugins/conf_remap/Makefile.am | 5 +- plugins/conf_remap/conf_remap.cc | 11 +- plugins/experimental/authproxy/Makefile.am | 8 +- plugins/experimental/authproxy/authproxy.cc | 36 +- plugins/experimental/authproxy/utils.h | 2 +- .../experimental/buffer_upload/buffer_upload.cc | 2 +- plugins/experimental/cacheurl/Makefile.am | 5 +- plugins/experimental/cacheurl/README | 25 - plugins/experimental/cacheurl/README.rst | 86 + plugins/experimental/cacheurl/cacheurl.c | 228 +- plugins/experimental/channel_stats/Makefile.am | 5 +- .../experimental/channel_stats/channel_stats.cc | 56 +- plugins/experimental/channel_stats/debug_macros.h | 6 +- plugins/experimental/combo_handler/README | 84 - .../experimental/combo_handler/combo_handler.cc | 883 -- plugins/experimental/custom_redirect/Makefile.am | 6 +- .../custom_redirect/custom_redirect.cc | 4 +- plugins/experimental/esi/Makefile.am | 36 +- plugins/experimental/esi/README | 3 +- plugins/experimental/esi/README.combo | 84 + plugins/experimental/esi/combo_handler.cc | 843 ++ plugins/experimental/esi/esi.cc | 1805 ++++ .../esi/fetcher/HttpDataFetcherImpl.cc | 66 +- .../experimental/esi/fetcher/HttpDataFetcherImpl.h | 10 +- plugins/experimental/esi/lib/DocNode.cc | 8 +- plugins/experimental/esi/lib/DocNode.h | 4 +- plugins/experimental/esi/lib/EsiGzip.cc | 163 + plugins/experimental/esi/lib/EsiGzip.h | 60 + plugins/experimental/esi/lib/EsiProcessor.cc | 210 + plugins/experimental/esi/lib/EsiProcessor.h | 9 + plugins/experimental/esi/lib/FailureInfo.h | 2 +- .../experimental/esi/lib/SpecialIncludeHandler.h | 1 + plugins/experimental/esi/lib/Variables.cc | 2 +- plugins/experimental/esi/plugin.cc | 1688 --- plugins/experimental/esi/serverIntercept.cc | 4 +- .../experimental/esi/test/TestHandlerManager.cc | 2 +- plugins/experimental/geoip_acl/lulu.h | 14 +- plugins/experimental/gzip/Makefile.am | 5 +- plugins/experimental/gzip/gzip.cc | 17 +- plugins/experimental/gzip/misc.cc | 14 +- plugins/experimental/gzip/misc.h | 2 - plugins/experimental/header_rewrite/Makefile.am | 24 +- plugins/experimental/header_rewrite/condition.cc | 4 - plugins/experimental/header_rewrite/condition.h | 3 - plugins/experimental/header_rewrite/conditions.cc | 18 +- plugins/experimental/header_rewrite/conditions.h | 11 +- plugins/experimental/header_rewrite/factory.cc | 3 - plugins/experimental/header_rewrite/factory.h | 3 - .../experimental/header_rewrite/header_rewrite.cc | 8 +- plugins/experimental/header_rewrite/lulu.h | 15 +- plugins/experimental/header_rewrite/matcher.cc | 4 - plugins/experimental/header_rewrite/matcher.h | 53 +- plugins/experimental/header_rewrite/operator.cc | 4 - plugins/experimental/header_rewrite/operator.h | 3 - plugins/experimental/header_rewrite/operators.cc | 4 - plugins/experimental/header_rewrite/operators.h | 5 +- plugins/experimental/header_rewrite/parser.cc | 3 - plugins/experimental/header_rewrite/parser.h | 4 - plugins/experimental/header_rewrite/resources.cc | 4 - plugins/experimental/header_rewrite/resources.h | 4 - plugins/experimental/header_rewrite/ruleset.cc | 3 - plugins/experimental/header_rewrite/ruleset.h | 4 - plugins/experimental/header_rewrite/statement.cc | 3 - plugins/experimental/header_rewrite/statement.h | 5 +- plugins/experimental/header_rewrite/value.h | 3 - plugins/experimental/hipes/hipes.cc | 6 +- plugins/experimental/lua/Makefile.am | 11 +- plugins/experimental/lua/hook.cc | 12 +- plugins/experimental/lua/lapi.cc | 6 +- plugins/experimental/lua/lconfig.cc | 6 +- plugins/experimental/lua/lutil.cc | 8 +- plugins/experimental/lua/lutil.h | 9 +- plugins/experimental/lua/remap.cc | 11 +- plugins/experimental/lua/state.cc | 6 +- plugins/experimental/metalink/Makefile.am | 5 +- plugins/experimental/metalink/metalink.cc | 25 +- plugins/experimental/rfc5861/Makefile.am | 5 +- plugins/experimental/rfc5861/rfc5861.c | 9 +- plugins/experimental/spdy/Makefile.am | 12 +- plugins/experimental/spdy/http.cc | 4 +- plugins/experimental/spdy/lib/base/logging.h | 7 - plugins/experimental/spdy/lib/spdy/message.cc | 32 +- plugins/experimental/spdy/protocol.cc | 6 +- plugins/experimental/spdy/spdy.cc | 12 +- plugins/experimental/spdy/stream.cc | 4 +- plugins/experimental/tcp_info/Makefile.am | 7 +- plugins/experimental/tcp_info/tcp_info.cc | 4 +- plugins/header_filter/Makefile.am | 6 +- plugins/header_filter/header_filter.cc | 6 +- plugins/header_filter/lulu.h | 11 +- plugins/libloader/libloader.c | 85 + plugins/regex_remap/Makefile.am | 6 +- plugins/regex_remap/regex_remap.cc | 11 +- plugins/stats_over_http/Makefile.am | 5 +- plugins/stats_over_http/stats_over_http.c | 8 +- proxy/AbstractBuffer.cc | 1 - proxy/CacheControl.cc | 3 +- proxy/ControlBase.cc | 11 +- proxy/ControlMatcher.cc | 1 - proxy/ControlMatcher.h | 2 +- proxy/CoreUtils.cc | 1 - proxy/DiagsConfig.cc | 4 +- proxy/Error.cc | 3 - proxy/ICP.cc | 3 - proxy/ICPProcessor.cc | 2 - proxy/ICPStats.cc | 2 - proxy/InkAPI.cc | 49 +- proxy/InkAPITest.cc | 2 +- proxy/InkAPITestTool.cc | 3 - proxy/Main.cc | 201 +- proxy/Makefile.am | 95 +- proxy/MuxVC.cc | 187 +- proxy/ParentSelection.cc | 4 - proxy/Plugin.cc | 64 +- proxy/Plugin.h | 2 +- proxy/PluginDB.cc | 205 - proxy/PluginDB.h | 65 - proxy/PluginVC.cc | 25 +- proxy/Prefetch.cc | 8 +- proxy/ReverseProxy.cc | 1 - proxy/ReverseProxy.h | 2 +- proxy/StatSystem.cc | 4 +- proxy/TestClock.cc | 1 - proxy/TestClusterHash.cc | 2 - proxy/TestDNS.cc | 1 - proxy/TestHook.cc | 513 - proxy/TestPreProc.cc | 2 - proxy/TestProxy.cc | 19 - proxy/TestRegex.cc | 1 - proxy/TestSimpleProxy.cc | 1 - proxy/UglyLogStubs.cc | 3 - proxy/Update.cc | 2 +- proxy/api/ts/experimental.h | 4 + proxy/api/ts/ts.h.in | 4 - proxy/config/Makefile.am | 1 - .../body_factory/default/response#bad_version | 2 +- proxy/config/mgr.cnf.default | 9 - proxy/config/records.config.default.in | 3 + proxy/config/vaddrs.config.default | 11 +- proxy/congest/Congestion.cc | 2 +- proxy/congest/CongestionDB.cc | 2 - proxy/hdrs/HTTP.cc | 45 +- proxy/hdrs/HTTP.h | 135 +- proxy/hdrs/HdrHeap.h | 5 +- proxy/hdrs/HdrTSOnly.cc | 8 +- proxy/hdrs/HdrTest.cc | 3 +- proxy/hdrs/HdrToken.cc | 6 +- proxy/hdrs/HdrToken.h | 31 +- proxy/hdrs/HdrUtils.cc | 2 +- proxy/hdrs/HttpCompat.h | 1 - proxy/hdrs/MIME.cc | 79 +- proxy/hdrs/MIME.h | 3 +- proxy/hdrs/URL.cc | 11 +- proxy/hdrs/URL.h | 74 +- proxy/http/HttpBodyFactory.cc | 8 +- proxy/http/HttpBodyFactory.h | 21 +- proxy/http/HttpClientSession.cc | 2 +- proxy/http/HttpConfig.cc | 3 - proxy/http/HttpConfig.h | 3 - proxy/http/HttpDebugNames.cc | 1 - proxy/http/HttpProxyServerMain.cc | 49 - proxy/http/HttpSM.cc | 241 +- proxy/http/HttpServerSession.h | 4 +- proxy/http/HttpTransact.cc | 623 +- proxy/http/HttpTransact.h | 19 +- proxy/http/HttpTransactCache.cc | 70 +- proxy/http/HttpTransactHeaders.cc | 28 +- proxy/http/HttpTransactHeaders.h | 2 +- proxy/http/HttpTunnel.cc | 11 +- proxy/http/HttpUpdateTester.cc | 4 +- proxy/http/TestHttpTransact.cc | 1 - proxy/http/TestUrl.cc | 1 - proxy/http/remap/RemapPlugins.cc | 4 +- proxy/http/remap/RemapProcessor.cc | 4 +- proxy/http/remap/UrlMapping.cc | 2 +- proxy/http/remap/UrlMappingPathIndex.h | 9 + proxy/http/test_socket_close.cc | 1 - proxy/http/testheaders.cc | 1 - proxy/logcat.cc | 15 +- proxy/logging/Log.cc | 6 +- proxy/logging/LogAccess.cc | 50 +- proxy/logging/LogAccess.h | 2 - proxy/logging/LogAccessHttp.cc | 62 +- proxy/logging/LogAccessHttp.h | 4 +- proxy/logging/LogAccessTest.cc | 1 - proxy/logging/LogBuffer.cc | 11 +- proxy/logging/LogBuffer.h | 6 +- proxy/logging/LogCollationClientSM.cc | 2 +- proxy/logging/LogConfig.cc | 96 +- proxy/logging/LogConfig.h | 30 +- proxy/logging/LogField.cc | 2 +- proxy/logging/LogFieldAliasMap.h | 2 +- proxy/logging/LogFile.cc | 17 +- proxy/logging/LogFilter.cc | 2 +- proxy/logging/LogFormat.cc | 2 - proxy/logging/LogObject.cc | 40 +- proxy/logging/LogSock.cc | 2 - proxy/logging/LogStandalone.cc | 8 +- proxy/logging/LogUtils.cc | 7 +- proxy/logstats.cc | 100 +- proxy/sac.cc | 7 +- proxy/signals.cc | 6 +- proxy/tests/logstats.blog | Bin 0 -> 14976 bytes proxy/tests/logstats.json | 243 + proxy/tests/logstats.summary | 164 + proxy/tests/test_logstats_json | 28 + proxy/tests/test_logstats_summary | 29 + tools/Makefile.am | 39 +- tools/http_load/Makefile | 52 - tools/http_load/http_load.c | 84 +- tools/http_load/timers.c | 6 +- tools/http_load/version.h | 8 - tools/jtest/Makefile | 7 - tools/jtest/jtest.cc | 8387 +++++++-------- tools/tstop/.gitignore | 1 + tools/tstop/README | 4 + tools/tstop/stats.h | 393 + tools/tstop/tstop.cc | 373 + tools/tsxs.in | 5 +- 567 files changed, 16505 insertions(+), 17338 deletions(-) ----------------------------------------------------------------------
