Merge branch 'master' into 5.0.x
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c63666b1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c63666b1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c63666b1 Branch: refs/heads/5.0.x Commit: c63666b1353fd089bc42f6f535a95c75548cc321 Parents: 3433ea6 c54477a Author: Leif Hedstrom <[email protected]> Authored: Thu Nov 21 11:41:47 2013 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Thu Nov 21 11:41:47 2013 -0700 ---------------------------------------------------------------------- .gitattributes | 1 + .gitignore | 8 +- CHANGES | 23 +- Makefile.am | 28 +- README-EC2 | 268 +- ci/jenkins/README | 32 + ci/jenkins/jobs.yaml | 76 +- cmd/Makefile.am | 18 + cmd/traffic_cop/Makefile.am | 43 + cmd/traffic_cop/traffic_cop.cc | 1849 +++++++ cmd/traffic_line/Makefile.am | 36 + cmd/traffic_line/traffic_line.cc | 218 + cmd/traffic_shell/CliCreateCommands.cc | 318 ++ cmd/traffic_shell/CliCreateCommands.h | 39 + cmd/traffic_shell/CliDisplay.cc | 221 + cmd/traffic_shell/CliDisplay.h | 91 + cmd/traffic_shell/CliMgmtUtils.cc | 625 +++ cmd/traffic_shell/CliMgmtUtils.h | 152 + cmd/traffic_shell/ConfigCmd.cc | 4626 ++++++++++++++++++ cmd/traffic_shell/ConfigCmd.h | 865 ++++ cmd/traffic_shell/ConfigUpgradeCmd.cc | 634 +++ cmd/traffic_shell/ConfigUpgradeCmd.h | 252 + cmd/traffic_shell/ConfigUpgradeReadCmd.cc | 498 ++ cmd/traffic_shell/ConfigUpgradeWriteCmd.cc | 517 ++ cmd/traffic_shell/Makefile.am | 77 + cmd/traffic_shell/ShowCmd.cc | 2322 +++++++++ cmd/traffic_shell/ShowCmd.h | 247 + cmd/traffic_shell/UtilCmds.cc | 196 + cmd/traffic_shell/UtilCmds.h | 94 + cmd/traffic_shell/cliAppInit.cc | 165 + cmd/traffic_shell/cliParseArg.cc | 457 ++ cmd/traffic_shell/cli_detailed_command_list.txt | 1623 ++++++ cmd/traffic_shell/cli_feature_spec.txt | 230 + cmd/traffic_shell/commandOptions.h | 47 + cmd/traffic_shell/createArgument.cc | 387 ++ cmd/traffic_shell/createArgument.h | 119 + cmd/traffic_shell/createCommand.cc | 166 + cmd/traffic_shell/createCommand.h | 59 + cmd/traffic_shell/definitions.h | 77 + cmd/traffic_shell/hashtable.cc | 219 + cmd/traffic_shell/hashtable.h | 45 + cmd/traffic_shell/processArgument.cc | 57 + cmd/traffic_shell/traffic_shell.cc | 113 + cmd/traffic_top/Makefile.am | 41 + cmd/traffic_top/README | 4 + cmd/traffic_top/stats.h | 457 ++ cmd/traffic_top/traffic_top.cc | 465 ++ config.layout | 2 +- configure.ac | 7 +- cop/Makefile.am | 42 - cop/TrafficCop.cc | 1849 ------- doc/admin/getting-started.en.rst | 2 +- doc/admin/monitoring-traffic.en.rst | 2 +- doc/arch/cache/cache-api.en.rst | 84 +- doc/arch/cache/cache-appendix.en.rst | 194 +- doc/arch/cache/cache-arch.en.rst | 1596 +++--- doc/arch/cache/cache-data-structures.en.rst | 328 +- .../cache/images/ats-cache-write-cursor.png | Bin .../cache/images/cache-directory-structure.png | Bin .../cache/images/cache-doc-layout-3-2-0.png | Bin .../cache/images/cache-doc-layout-4-0-1.png | Bin doc/arch/cache/images/cache-multi-fragment.png | Bin doc/arch/cache/images/cache-stripe-layout.png | Bin doc/arch/cache/images/dir-bucket-assign.png | Bin doc/arch/cache/images/dir-segment-bucket.png | Bin doc/arch/cache/tier-storage.en.rst | 236 +- doc/conf.py | 3 +- .../api/TSMimeHdrFieldValueStringGet.en.rst | 111 + doc/reference/api/index.en.rst | 1 + doc/reference/commands/index.en.rst | 8 +- doc/reference/commands/traffic_top.en.rst | 27 + doc/reference/commands/tstop.en.rst | 29 - .../working-with-http-headers.en.rst | 2 +- example/append-transform/append-transform.c | 2 +- example/basic-auth/basic-auth.c | 2 +- example/remap/remap.cc | 4 +- example/response-header-1/response-header-1.c | 2 +- example/thread-pool/psi.c | 2 +- iocore/cache/Cache.cc | 30 +- iocore/cache/CacheHttp.cc | 16 +- iocore/cache/CacheRead.cc | 10 +- iocore/cache/CacheWrite.cc | 4 - iocore/cache/I_CacheDefs.h | 2 +- iocore/cache/Makefile.am | 3 - iocore/cache/P_CacheInternal.h | 13 +- iocore/cache/RamCacheCLFUS.cc | 4 +- iocore/cache/RamCacheLRU.cc | 2 +- iocore/dns/DNS.cc | 3 +- iocore/dns/Makefile.am | 4 - iocore/dns/P_DNSProcessor.h | 26 - iocore/dns/P_SplitDNSProcessor.h | 27 + iocore/eventsystem/I_EThread.h | 17 - iocore/eventsystem/I_Event.h | 2 +- iocore/eventsystem/I_ProxyAllocator.h | 51 +- iocore/eventsystem/I_Thread.h | 21 +- iocore/eventsystem/P_IOBuffer.h | 20 +- iocore/eventsystem/ProxyAllocator.cc | 6 +- iocore/hostdb/HostDB.cc | 2 +- iocore/hostdb/Makefile.am | 3 - iocore/hostdb/MultiCache.cc | 1 - iocore/net/Makefile.am | 4 - iocore/net/Socks.cc | 2 +- lib/records/RecMessage.cc | 6 +- mgmt/Makefile.am | 2 +- mgmt/api/Makefile.am | 5 +- mgmt/cli/CliCreateCommands.cc | 318 -- mgmt/cli/CliCreateCommands.h | 39 - mgmt/cli/CliDisplay.cc | 221 - mgmt/cli/CliDisplay.h | 91 - mgmt/cli/CliMgmtUtils.cc | 625 --- mgmt/cli/CliMgmtUtils.h | 152 - mgmt/cli/ConfigCmd.cc | 4626 ------------------ mgmt/cli/ConfigCmd.h | 865 ---- mgmt/cli/ConfigUpgradeCmd.cc | 634 --- mgmt/cli/ConfigUpgradeCmd.h | 252 - mgmt/cli/ConfigUpgradeReadCmd.cc | 498 -- mgmt/cli/ConfigUpgradeWriteCmd.cc | 517 -- mgmt/cli/Makefile.am | 88 - mgmt/cli/ShowCmd.cc | 2322 --------- mgmt/cli/ShowCmd.h | 247 - mgmt/cli/TrafficLine.cc | 218 - mgmt/cli/UtilCmds.cc | 196 - mgmt/cli/UtilCmds.h | 94 - mgmt/cli/cliAppInit.cc | 165 - mgmt/cli/cliMain.cc | 113 - mgmt/cli/cliParseArg.cc | 457 -- mgmt/cli/cli_detailed_command_list.txt | 1623 ------ mgmt/cli/cli_feature_spec.txt | 230 - mgmt/cli/commandOptions.h | 47 - mgmt/cli/createArgument.cc | 387 -- mgmt/cli/createArgument.h | 119 - mgmt/cli/createCommand.cc | 166 - mgmt/cli/createCommand.h | 59 - mgmt/cli/definitions.h | 77 - mgmt/cli/hashtable.cc | 219 - mgmt/cli/hashtable.h | 45 - mgmt/cli/processArgument.cc | 57 - plugins/experimental/authproxy/utils.cc | 4 +- plugins/experimental/balancer/hashkey.h | 2 +- .../experimental/buffer_upload/buffer_upload.cc | 2 +- .../custom_redirect/custom_redirect.cc | 2 +- plugins/experimental/esi/combo_handler.cc | 2 +- plugins/experimental/lua/lapi.cc | 2 +- .../memcached_remap/memcached_remap.cc | 4 +- plugins/experimental/metalink/metalink.cc | 2 +- plugins/experimental/mysql_remap/mysql_remap.cc | 498 +- plugins/experimental/spdy/http.cc | 2 +- plugins/gzip/gzip.cc | 2 +- plugins/header_filter/rules.cc | 2 +- plugins/header_rewrite/conditions.cc | 5 +- plugins/regex_remap/regex_remap.cc | 160 +- proxy/ICPConfig.cc | 6 + proxy/ICPlog.h | 1 + proxy/Initialize.cc | 39 +- proxy/Initialize.h | 2 +- proxy/InkAPITest.cc | 11 +- proxy/config/logs_xml.config.default | 24 +- proxy/hdrs/HdrHeap.cc | 4 +- proxy/http/HttpClientSession.cc | 2 +- proxy/http/HttpSM.cc | 5 + proxy/http/HttpServerSession.cc | 2 +- proxy/http/HttpTransactCache.cc | 5 - proxy/logging/Log.cc | 37 +- proxy/logging/LogAccess.cc | 30 +- proxy/logging/LogAccess.h | 5 +- proxy/logging/LogAccessHttp.cc | 13 + proxy/logging/LogAccessHttp.h | 1 + proxy/logging/LogAccessICP.cc | 13 + proxy/logging/LogAccessICP.h | 3 +- proxy/logging/LogField.cc | 79 +- proxy/logging/LogField.h | 31 + proxy/logging/LogFormat.cc | 15 +- proxy/shared/UglyLogStubs.cc | 1 - proxy/signals.cc | 4 +- tools/Makefile.am | 18 - tools/tstop/.gitignore | 1 - tools/tstop/README | 4 - tools/tstop/stats.h | 393 -- tools/tstop/tstop.cc | 378 -- 179 files changed, 21048 insertions(+), 20461 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c63666b1/CHANGES ---------------------------------------------------------------------- diff --cc CHANGES index 4877e65,8fc1232..0882bf2 --- a/CHANGES +++ b/CHANGES @@@ -1,12 -1,28 +1,33 @@@ -*- coding: utf-8 -*- -Changes with Apache Traffic Server 4.2.0 +Changes with Apache Traffic Server 5.0.0 + + *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster + compatibility, so all cluster nodes should be upgraded simultaneously. + *) [TS-2379] Add a new field: '%<chp>', "client_host_port" to LogFormat. + + *) [TS-2374] Abort the producer if the none of it`s consumers is alive. + + *) [TS-2327] TSRedirectUrlSet does not perform DNS lookup of redirected OS + + *) [TS-1468] Check vary and accept headers on non-200 responses in cache + + *) [TS-2352] refine THREAD_ALLOC feature. + + *) [TS-2364] Introduce slice notation to field syntax in log format. + + *) [TS-2360] Fix usage of TSMimeHdrFieldValueStringGet() IDX in some plugins. + + *) [TS-2361] Load regex_remap configuration relative to the configuration directory. + + *) [TS-2359] Make install over existing installation can fail. + + *) [TS-2350] Enhancements to traffic_top + + *) [TS-2348] Rename tstop to traffic_top. +Changes with Apache Traffic Server 4.2.0 + *) [TS-2340] Fix TextLogObject log rolling. Author: bettydramit <[email protected]> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c63666b1/iocore/cache/Cache.cc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c63666b1/iocore/cache/CacheRead.cc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c63666b1/iocore/cache/P_CacheInternal.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c63666b1/proxy/http/HttpSM.cc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c63666b1/proxy/http/HttpTransactCache.cc ----------------------------------------------------------------------
