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/39503639 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/39503639 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/39503639 Branch: refs/heads/master Commit: 3950363913e37ca2c12130f51cfff13993544530 Parents: 2be6402 13cc7d7 Author: Manjesh Nilange <manjeshnila...@yahoo.com> Authored: Wed Jun 25 14:31:34 2014 -0700 Committer: Manjesh Nilange <manjeshnila...@yahoo.com> Committed: Wed Jun 25 14:31:34 2014 -0700 ---------------------------------------------------------------------- CHANGES | 185 +- NOTICE | 2 +- build/ax_check_openssl.m4 | 8 + ci/jenkins/bin/build.sh | 8 +- ci/jenkins/bin/clang-analyzer.sh | 4 +- ci/jenkins/bin/coverity.sh | 41 + ci/jenkins/bin/environment.sh | 6 + ci/jenkins/bin/in_tree.sh | 21 +- ci/jenkins/bin/out_of_tree.sh | 31 +- ci/jenkins/bin/rat.sh | 4 + ci/jenkins/bin/snapshot.sh | 6 - ci/rat-excludes.txt | 129 - ci/rat-regex.txt | 3 + cmd/Makefile.am | 2 +- cmd/traffic_cop/traffic_cop.cc | 2 +- cmd/traffic_line/traffic_line.cc | 20 +- cmd/traffic_shell/CliCreateCommands.cc | 310 -- cmd/traffic_shell/CliCreateCommands.h | 39 - cmd/traffic_shell/CliDisplay.cc | 221 - cmd/traffic_shell/CliDisplay.h | 91 - cmd/traffic_shell/CliMgmtUtils.cc | 586 --- cmd/traffic_shell/CliMgmtUtils.h | 150 - cmd/traffic_shell/ConfigCmd.cc | 4156 ------------------ cmd/traffic_shell/ConfigCmd.h | 837 ---- 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 | 1605 ------- 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 | 115 - configure.ac | 300 +- contrib/manifests/omnios.sh | 1 - doc/Makefile.am | 32 +- doc/admin/event-logging-formats.en.rst | 10 + doc/admin/hierachical-caching.en.rst | 2 +- doc/admin/http-proxy-caching.en.rst | 16 +- doc/admin/index.en.rst | 1 + doc/admin/security-options.en.rst | 1 - doc/admin/session-protocol.en.rst | 55 + doc/admin/working-log-files.en.rst | 2 +- doc/arch/cache/cache-arch.en.rst | 14 +- doc/arch/cache/tier-storage.en.rst | 4 +- doc/conf.py | 16 +- doc/ext/traffic-server.py | 6 +- .../ja/LC_MESSAGES/admin/security-options.en.po | 4 - doc/man/config_alarms.1 | 52 - doc/man/config_cache.1 | 140 - doc/man/config_clock.1 | 64 - doc/man/config_dns.1 | 46 - doc/man/config_get.1 | 37 - doc/man/config_hard-restart.1 | 31 - doc/man/config_hostdb.1 | 72 - doc/man/config_http.1 | 78 - doc/man/config_icp.1 | 72 - doc/man/config_logging.1 | 160 - doc/man/config_name.1 | 36 - doc/man/config_network.1 | 75 - doc/man/config_parent.1 | 53 - doc/man/config_port-tunnels.1 | 35 - doc/man/config_remap.1 | 35 - doc/man/config_reset-stats.1 | 46 - doc/man/config_restart.1 | 33 - doc/man/config_root.1 | 34 - doc/man/config_scheduled-update.1 | 84 - doc/man/config_security.1 | 52 - doc/man/config_set.1 | 36 - doc/man/config_socks.1 | 60 - doc/man/config_ssl.1 | 43 - doc/man/config_start.1 | 32 - doc/man/config_stop.1 | 31 - doc/man/config_upgrade.1 | 52 - doc/man/config_virtual-ip.1 | 52 - doc/man/disable.1 | 33 - doc/man/enable.1 | 42 - doc/man/exit.1 | 34 - doc/man/traffic_shell.1 | 165 - .../api/TSHttpConnectWithPluginId.en.rst | 60 + .../api/TSHttpIsInternalRequest.en.rst | 59 + .../api/TSHttpOverridableConfig.en.rst | 1 + doc/reference/api/TSUrlHostSet.en.rst | 12 +- doc/reference/commands/traffic_line.en.rst | 2 +- doc/reference/configuration/icp.config.en.rst | 4 - .../configuration/ip_allow.config.en.rst | 13 +- .../configuration/logs_xml.config.en.rst | 21 +- .../configuration/records.config.en.rst | 242 +- doc/reference/configuration/remap.config.en.rst | 21 + doc/reference/plugins/esi.en.rst | 132 +- doc/reference/plugins/header_rewrite.en.rst | 2 + doc/reference/plugins/tcpinfo.en.rst | 1 + doc/reference/plugins/ts_lua.en.rst | 2202 ++++++++-- iocore/aio/Makefile.am | 2 +- iocore/aio/test_AIO.cc | 2 +- iocore/cache/Cache.cc | 93 +- iocore/cache/CacheDir.cc | 2 +- iocore/cache/CacheDisk.cc | 10 +- iocore/cache/CacheHosting.cc | 16 +- iocore/cache/CachePages.cc | 4 +- iocore/cache/CachePagesInternal.cc | 2 +- iocore/cache/I_CacheDefs.h | 2 +- iocore/cache/P_CacheArray.h | 6 +- iocore/cache/P_CacheHosting.h | 2 +- iocore/cache/Store.cc | 34 +- iocore/cluster/ClusterAPI.cc | 10 +- iocore/cluster/ClusterCache.cc | 4 +- iocore/cluster/ClusterConfig.cc | 10 +- iocore/cluster/ClusterHandlerBase.cc | 29 +- iocore/cluster/ClusterMachine.cc | 4 +- iocore/cluster/ClusterProcessor.cc | 12 +- iocore/cluster/test_I_Cluster.cc | 2 +- iocore/cluster/test_P_Cluster.cc | 2 +- iocore/dns/DNS.cc | 4 +- iocore/dns/SplitDNS.cc | 6 +- iocore/dns/test_I_DNS.cc | 2 +- iocore/dns/test_P_DNS.cc | 4 +- iocore/eventsystem/IOBuffer.cc | 2 +- iocore/eventsystem/Makefile.am | 2 +- iocore/eventsystem/P_Freer.h | 26 +- iocore/eventsystem/P_IOBuffer.h | 15 +- iocore/eventsystem/Tasks.cc | 3 + iocore/eventsystem/UnixEventProcessor.cc | 6 +- iocore/eventsystem/test_Buffer.cc | 2 +- iocore/eventsystem/test_Event.cc | 2 +- iocore/hostdb/HostDB.cc | 10 +- iocore/hostdb/MultiCache.cc | 10 +- iocore/hostdb/P_HostDBProcessor.h | 2 +- iocore/hostdb/P_MultiCache.h | 2 +- iocore/hostdb/test_I_HostDB.cc | 6 +- iocore/hostdb/test_P_HostDB.cc | 4 +- iocore/net/I_NetVConnection.h | 3 - iocore/net/NetTest-http-server.c | 7 +- iocore/net/P_SSLNetVConnection.h | 1 + iocore/net/P_SSLNextProtocolSet.h | 4 +- iocore/net/P_SSLUtils.h | 3 + iocore/net/P_UnixNetVConnection.h | 1 - iocore/net/P_UnixUDPConnection.h | 2 +- iocore/net/SSLCertLookup.cc | 2 +- iocore/net/SSLConfig.cc | 18 +- iocore/net/SSLNetAccept.cc | 2 +- iocore/net/SSLNetProcessor.cc | 20 +- iocore/net/SSLNetVConnection.cc | 26 +- iocore/net/SSLNextProtocolAccept.cc | 3 +- iocore/net/SSLNextProtocolSet.cc | 52 +- iocore/net/SSLUtils.cc | 15 +- iocore/net/SessionAccept.cc | 4 +- iocore/net/UnixNet.cc | 6 +- iocore/net/UnixNetAccept.cc | 2 +- iocore/net/UnixNetPages.cc | 2 +- iocore/net/UnixNetProcessor.cc | 8 +- iocore/net/UnixNetVConnection.cc | 9 +- iocore/net/UnixUDPNet.cc | 4 +- iocore/net/test_I_Net.cc | 2 +- iocore/net/test_I_UDPNet.cc | 2 +- iocore/net/test_P_Net.cc | 8 +- iocore/net/test_P_UDPNet.cc | 2 +- iocore/utils/diags.i | 2 +- lib/Makefile.am | 14 +- lib/atscppapi/src/TransformationPlugin.cc | 4 +- lib/perl/Makefile.am | 2 +- lib/perl/lib/Apache/TS/AdminClient.pm | 2 +- lib/records/I_RecCore.h | 10 + lib/records/I_RecDefs.h | 1 + lib/records/I_RecHttp.h | 190 +- lib/records/Makefile.am | 2 - lib/records/RecCore.cc | 36 +- lib/records/RecHttp.cc | 286 +- lib/records/RecLocal.cc | 34 +- lib/records/RecMessage.cc | 179 +- lib/records/RecProcess.cc | 8 +- lib/records/test_I_RecLocal.cc | 2 +- lib/records/test_RecProcess.i | 2 +- lib/ts/Compatability.h | 2 - lib/ts/Diags.cc | 3 +- lib/ts/DynArray.h | 6 +- lib/ts/HostLookup.cc | 14 +- lib/ts/Layout.cc | 2 +- lib/ts/Makefile.am | 9 +- lib/ts/ParseRules.h | 16 - lib/ts/Resource.cc | 68 - lib/ts/Resource.h | 65 - lib/ts/apidefs.h.in | 60 +- lib/ts/ink_atomic.h | 75 +- lib/ts/ink_defs.h | 22 - lib/ts/ink_memory.h | 1 + lib/ts/ink_res_init.cc | 2 +- lib/ts/ink_resolver.h | 8 +- lib/ts/libts.h | 1 - lib/ts/llqueue.cc | 1 + mgmt/Main.cc | 12 +- mgmt/Makefile.am | 2 +- mgmt/ProxyConfig.cc | 4 +- mgmt/ProxyConfig.h | 2 +- mgmt/RecordsConfig.cc | 74 +- mgmt/api/APITestCliRemote.cc | 28 +- mgmt/api/CoreAPI.cc | 17 +- mgmt/api/CoreAPIRemote.cc | 8 +- mgmt/api/EventCallback.cc | 1 + mgmt/api/GenericParser.cc | 56 +- mgmt/api/INKMgmtAPI.cc | 20 +- mgmt/api/NetworkUtilsRemote.cc | 1 + mgmt/api/TSControlMain.cc | 10 +- mgmt/api/include/Makefile.am | 4 +- mgmt/api/include/mgmtapi.h | 30 +- mgmt/cluster/ClusterCom.cc | 7 +- mgmt/stats/StatProcessor.cc | 2 +- mgmt/stats/StatType.cc | 16 +- mgmt/utils/MgmtHashTable.h | 2 +- mgmt/web2/WebHttp.cc | 7 - mgmt/web2/WebHttpContext.cc | 10 +- mgmt/web2/WebIntrMain.cc | 14 - mgmt/web2/WebUtils.cc | 7 - plugins/Makefile.am | 9 +- plugins/cacheurl/cacheurl.cc | 1 - plugins/experimental/Makefile.am | 9 +- .../experimental/collapsed_connection/LICENSE | 203 + .../collapsed_connection/Makefile.am | 25 + .../collapsed_connection/MurmurHash3.cc | 234 + .../collapsed_connection/MurmurHash3.h | 20 + .../experimental/collapsed_connection/NOTICE | 9 + .../P_collapsed_connection.h | 123 + .../experimental/collapsed_connection/README | 71 + .../collapsed_connection.cc | 1157 +++++ .../collapsed_connection/default.config | 5 + .../experimental/collapsed_connection/state.dot | 40 + plugins/experimental/esi/README | 96 - plugins/experimental/lua/Makefile.am | 35 - plugins/experimental/lua/TODO | 51 - .../experimental/lua/examples/cachestatus.lua | 48 - plugins/experimental/lua/examples/hooks.lua | 90 - plugins/experimental/lua/examples/remap.lua | 73 - plugins/experimental/lua/examples/test.lua | 30 - plugins/experimental/lua/hook.cc | 503 --- plugins/experimental/lua/hook.h | 39 - plugins/experimental/lua/lapi.cc | 651 --- plugins/experimental/lua/lapi.h | 63 - plugins/experimental/lua/lconfig.cc | 151 - plugins/experimental/lua/lutil.cc | 139 - plugins/experimental/lua/lutil.h | 85 - plugins/experimental/lua/plugin.cc | 45 - plugins/experimental/lua/remap.cc | 104 - plugins/experimental/lua/state.cc | 348 -- plugins/experimental/lua/state.h | 157 - .../experimental/regex_revalidate/Makefile.am | 21 + .../regex_revalidate/regex_revalidate.c | 594 +++ plugins/experimental/remap_stats/remap_stats.c | 43 +- plugins/experimental/rfc5861/Makefile.am | 21 - plugins/experimental/rfc5861/Makefile.tsxs | 26 - plugins/experimental/rfc5861/README | 26 - plugins/experimental/rfc5861/rfc5861.c | 744 ---- plugins/experimental/rfc5861/test_server.js | 42 - .../stale_while_revalidate/Makefile.am | 21 + .../stale_while_revalidate/Makefile.tsxs | 27 + .../experimental/stale_while_revalidate/README | 26 + .../stale_while_revalidate.c | 744 ++++ .../stale_while_revalidate/test_server.js | 42 + plugins/experimental/ts_lua/Makefile.am | 8 +- plugins/experimental/ts_lua/README.md | 541 --- .../ts_lua/example/test_closure.lua | 23 + plugins/experimental/ts_lua/ts_lua.c | 274 +- plugins/experimental/ts_lua/ts_lua_atomic.c | 96 - plugins/experimental/ts_lua/ts_lua_atomic.h | 33 - .../ts_lua/ts_lua_cached_response.c | 176 +- .../experimental/ts_lua/ts_lua_client_request.c | 226 + .../ts_lua/ts_lua_client_response.c | 229 +- plugins/experimental/ts_lua/ts_lua_common.h | 75 +- plugins/experimental/ts_lua/ts_lua_crypto.c | 177 + plugins/experimental/ts_lua/ts_lua_crypto.h | 27 + plugins/experimental/ts_lua/ts_lua_hook.c | 178 +- plugins/experimental/ts_lua/ts_lua_http.c | 58 +- plugins/experimental/ts_lua/ts_lua_http_cntl.c | 101 + plugins/experimental/ts_lua/ts_lua_http_cntl.h | 27 + .../experimental/ts_lua/ts_lua_http_config.c | 304 ++ .../experimental/ts_lua/ts_lua_http_config.h | 27 + .../experimental/ts_lua/ts_lua_http_intercept.c | 72 +- plugins/experimental/ts_lua/ts_lua_log.c | 2 +- plugins/experimental/ts_lua/ts_lua_mgmt.c | 106 + plugins/experimental/ts_lua/ts_lua_mgmt.h | 27 + plugins/experimental/ts_lua/ts_lua_misc.c | 146 +- plugins/experimental/ts_lua/ts_lua_package.c | 297 ++ plugins/experimental/ts_lua/ts_lua_package.h | 27 + plugins/experimental/ts_lua/ts_lua_remap.c | 36 +- .../experimental/ts_lua/ts_lua_server_request.c | 194 + .../ts_lua/ts_lua_server_response.c | 180 +- plugins/experimental/ts_lua/ts_lua_string.c | 32 + plugins/experimental/ts_lua/ts_lua_string.h | 30 + plugins/experimental/ts_lua/ts_lua_transform.c | 2 +- plugins/experimental/ts_lua/ts_lua_util.c | 270 +- plugins/experimental/ts_lua/ts_lua_util.h | 8 + plugins/header_rewrite/Makefile.am | 6 +- plugins/header_rewrite/conditions.cc | 49 +- plugins/header_rewrite/conditions.h | 19 + plugins/header_rewrite/expander.cc | 28 - plugins/header_rewrite/factory.cc | 4 + plugins/header_rewrite/lulu.cc | 63 + plugins/header_rewrite/lulu.h | 7 + plugins/tcpinfo/tcpinfo.cc | 5 + proxy/AbstractBuffer.cc | 2 +- proxy/CacheControl.cc | 8 +- proxy/ControlMatcher.cc | 26 +- proxy/CoreUtils.cc | 335 +- proxy/CoreUtils.h | 29 - proxy/FetchSM.cc | 52 +- proxy/FetchSM.h | 8 +- proxy/ICP.cc | 90 +- proxy/ICPConfig.cc | 18 +- proxy/IPAllow.cc | 48 +- proxy/IPAllow.h | 69 +- proxy/InkAPI.cc | 171 +- proxy/InkAPITest.cc | 33 +- proxy/InkIOCoreAPI.cc | 4 +- proxy/Main.cc | 33 +- proxy/Makefile.am | 14 +- proxy/ParentSelection.cc | 16 +- proxy/Plugin.h | 29 + proxy/PluginVC.cc | 20 +- proxy/PluginVC.h | 23 +- proxy/Prefetch.cc | 16 +- proxy/ProtocolProbeSessionAccept.cc | 23 +- proxy/ProtocolProbeSessionAccept.h | 25 +- proxy/ReverseProxy.cc | 6 +- proxy/SocksProxy.cc | 2 +- proxy/StatSystem.cc | 4 +- proxy/Transform.cc | 8 +- proxy/Update.cc | 34 +- proxy/api/ts/Makefile.am | 4 +- proxy/api/ts/experimental.h | 19 +- proxy/api/ts/ts.h | 49 +- .../default/redirect#moved_permanently | 14 + proxy/config/records.config.default.in | 659 +-- proxy/config/storage.config.default.in | 3 +- proxy/congest/Congestion.cc | 4 +- proxy/hdrs/HTTP.cc | 4 + proxy/hdrs/HTTP.h | 28 +- proxy/hdrs/HdrTest.cc | 5 +- proxy/hdrs/HdrToken.cc | 8 +- proxy/hdrs/MIME.cc | 4 +- proxy/hdrs/URL.cc | 3 +- proxy/hdrs/test_header.cc | 3 +- proxy/hdrs/test_urlhash.cc | 1 - proxy/http/HttpBodyFactory.cc | 16 +- proxy/http/HttpClientSession.cc | 15 +- proxy/http/HttpClientSession.h | 5 +- proxy/http/HttpConfig.cc | 55 +- proxy/http/HttpConfig.h | 25 +- proxy/http/HttpPages.cc | 2 +- proxy/http/HttpProxyServerMain.cc | 45 +- proxy/http/HttpSM.cc | 49 +- proxy/http/HttpSM.h | 8 +- proxy/http/HttpServerSession.cc | 1 + proxy/http/HttpSessionAccept.cc | 8 +- proxy/http/HttpSessionAccept.h | 11 + proxy/http/HttpSessionManager.cc | 2 +- proxy/http/HttpTransact.cc | 363 +- proxy/http/HttpTransact.h | 3 +- proxy/http/HttpTransactHeaders.cc | 12 + proxy/http/HttpTransactHeaders.h | 1 + proxy/http/HttpUpdateTester.cc | 2 +- proxy/http/remap/AclFiltering.cc | 29 +- proxy/http/remap/AclFiltering.h | 16 +- proxy/http/remap/RemapConfig.cc | 63 +- proxy/http/remap/RemapPlugins.cc | 2 +- proxy/http/remap/UrlMapping.cc | 2 +- proxy/http/remap/UrlRewrite.cc | 76 +- proxy/logging/Log.cc | 569 ++- proxy/logging/LogAccess.cc | 43 +- proxy/logging/LogAccess.h | 3 +- proxy/logging/LogAccessHttp.cc | 26 +- proxy/logging/LogAccessHttp.h | 3 +- proxy/logging/LogBuffer.cc | 6 +- proxy/logging/LogCollationAccept.cc | 2 +- proxy/logging/LogCollationClientSM.cc | 2 +- proxy/logging/LogCollationHostSM.cc | 2 +- proxy/logging/LogConfig.cc | 63 +- proxy/logging/LogField.cc | 3 +- proxy/logging/LogFilter.cc | 19 +- proxy/logging/LogFormat.cc | 10 +- proxy/logging/LogFormat.h | 5 +- proxy/logging/LogHost.cc | 9 +- proxy/logging/LogObject.cc | 24 +- proxy/logging/LogPredefined.cc | 18 +- proxy/logging/LogSock.cc | 6 +- proxy/logging/LogStandalone.cc | 6 +- proxy/logstats.cc | 6 +- proxy/sac.cc | 2 +- proxy/shared/DiagsConfig.cc | 4 +- proxy/shared/InkXml.cc | 6 +- proxy/shared/InkXml.h | 11 +- proxy/spdy/SpdyCallbacks.cc | 18 +- proxy/spdy/SpdyClientSession.cc | 120 +- proxy/spdy/SpdyClientSession.h | 25 +- proxy/spdy/SpdyCommon.cc | 53 +- proxy/spdy/SpdyCommon.h | 43 +- proxy/spdy/SpdyDefs.h | 39 + proxy/spdy/SpdySessionAccept.cc | 10 +- proxy/spdy/SpdySessionAccept.h | 6 +- tools/http_load/http_load.c | 13 + tools/lighttpd_mod_generator/Makefile | 2 +- tools/tsxs.in | 2 +- 414 files changed, 11833 insertions(+), 25817 deletions(-) ----------------------------------------------------------------------
