You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ja...@apache.org on 2015/02/25 03:16:42 UTC
[2/4] trafficserver git commit: Merge branch 'master' of
github.com:apache/trafficserver
Merge branch 'master' of github.com:apache/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1cd91cd7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1cd91cd7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1cd91cd7
Branch: refs/heads/master
Commit: 1cd91cd7b441e6e74f910c2fd66eba59c2712d47
Parents: 5ce2b6f ef9bd67
Author: Thomas Jackson <ja...@apache.org>
Authored: Tue Feb 24 18:10:38 2015 -0800
Committer: Thomas Jackson <ja...@apache.org>
Committed: Tue Feb 24 18:10:38 2015 -0800
----------------------------------------------------------------------
.gitignore | 1 +
CHANGES | 39 +-
build/common.m4 | 22 +
cmd/Makefile.am | 5 +-
cmd/traffic_ctl/Makefile.am | 40 +
cmd/traffic_ctl/alarm.cc | 137 +++
cmd/traffic_ctl/config.cc | 216 ++++
cmd/traffic_ctl/metric.cc | 142 +++
cmd/traffic_ctl/server.cc | 174 +++
cmd/traffic_ctl/storage.cc | 56 +
cmd/traffic_ctl/traffic_ctl.cc | 233 ++++
cmd/traffic_ctl/traffic_ctl.h | 201 ++++
cmd/traffic_line/traffic_line.cc | 5 +-
configure.ac | 64 +-
.../configuration/records.config.en.rst | 26 +
doc/reference/plugins/header_rewrite.en.rst | 2 +
iocore/cache/Cache.cc | 2 +-
iocore/eventsystem/I_Lock.h | 74 +-
iocore/eventsystem/Lock.cc | 56 +-
iocore/hostdb/I_HostDBProcessor.h | 21 +-
iocore/net/Net.cc | 5 +
iocore/net/P_Net.h | 1 +
iocore/net/UnixNet.cc | 33 +-
lib/perl/lib/Apache/TS/AdminClient.pm | 6 +-
lib/records/RecHttp.cc | 10 +-
lib/ts/Diags.h | 12 +-
lib/ts/Hash.h | 9 +
lib/ts/HashFNV.cc | 29 +-
lib/ts/HashFNV.h | 35 +-
lib/ts/apidefs.h.in | 1 +
lib/ts/ink_args.cc | 99 +-
lib/ts/ink_args.h | 11 +
lib/ts/ink_config.h.in | 1 +
lib/ts/ink_llqueue.h | 2 +-
lib/ts/ink_sock.cc | 49 +
lib/ts/ink_sock.h | 1 +
lib/ts/llqueue.cc | 7 +-
mgmt/Alarms.cc | 14 +-
mgmt/LocalManager.cc | 47 +-
mgmt/MgmtDefs.h | 2 +-
mgmt/RecordsConfig.cc | 14 +-
mgmt/api/CoreAPIShared.h | 3 +
mgmt/api/EventControlMain.cc | 11 +
mgmt/api/INKMgmtAPI.cc | 16 +-
mgmt/api/NetworkMessage.cc | 67 ++
mgmt/api/NetworkMessage.h | 3 +
mgmt/api/NetworkUtilsRemote.cc | 10 +-
mgmt/api/NetworkUtilsRemote.h | 3 +
mgmt/api/TSControlMain.cc | 122 ++-
mgmt/api/include/mgmtapi.h | 5 +-
mgmt/cluster/ClusterCom.cc | 6 +-
mgmt/utils/MgmtSocket.cc | 56 +
mgmt/utils/MgmtSocket.h | 6 +
mgmt/web2/WebIntrMain.cc | 108 +-
plugins/cacheurl/cacheurl.cc | 33 +-
plugins/experimental/escalate/escalate.cc | 28 +-
plugins/header_rewrite/conditions.cc | 43 +
plugins/header_rewrite/conditions.h | 19 +
plugins/header_rewrite/factory.cc | 2 +
proxy/Main.cc | 2 +
proxy/Makefile.am | 1 +
proxy/PluginVC.cc | 31 +-
proxy/PluginVC.h | 2 +-
proxy/hdrs/HdrToken.cc | 23 +-
proxy/hdrs/HdrToken.h | 6 +
proxy/hdrs/MIME.cc | 10 +
proxy/hdrs/MIME.h | 51 +-
proxy/http/HttpClientSession.cc | 22 +-
proxy/http/HttpClientSession.h | 3 +
proxy/http/HttpProxyServerMain.cc | 6 +-
proxy/http/HttpTransact.cc | 41 +
proxy/http/HttpTransact.h | 1 +
proxy/http/Makefile.am | 3 +-
proxy/http2/HPACK.cc | 156 +--
proxy/http2/HPACK.h | 27 +-
proxy/http2/HTTP2.cc | 401 ++++++-
proxy/http2/HTTP2.h | 129 ++-
proxy/http2/Http2ClientSession.cc | 85 +-
proxy/http2/Http2ClientSession.h | 32 +
proxy/http2/Http2ConnectionState.cc | 1015 +++++++++++++++++-
proxy/http2/Http2ConnectionState.h | 144 ++-
proxy/logstats.cc | 10 +-
82 files changed, 3955 insertions(+), 691 deletions(-)
----------------------------------------------------------------------