You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/05/16 05:37:41 UTC
[1/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver into ram_cache
Updated Branches:
refs/heads/master 65f9c15c6 -> dcef71e98
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into ram_cache
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dcef71e9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dcef71e9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dcef71e9
Branch: refs/heads/master
Commit: dcef71e984f26192b492f46c0d30152e30241769
Parents: 453f172 65f9c15
Author: jplevyak@apache.org <jp...@apache.org>
Authored: Tue May 15 20:33:41 2012 -0700
Committer: John Plevyak <jp...@acm.org>
Committed: Tue May 15 20:33:41 2012 -0700
----------------------------------------------------------------------
CHANGES | 33 ++-
configure.ac | 59 ++--
contrib/tstop/src/stats.h | 8 +
cop/TrafficCop.cc | 441 +++++++++-------------
example/add-header/add-header.c | 3 +-
example/add-header/readme.txt | 3 +-
example/append-transform/append-transform.c | 7 +-
example/append-transform/readme.txt | 3 +-
example/basic-auth/basic-auth.c | 46 +---
example/basic-auth/readme.txt | 4 +-
example/bnull-transform/bnull-transform.c | 3 +-
example/file-1/file-1.c | 3 +-
example/file-1/readme.txt | 3 +-
example/null-transform/null-transform.c | 3 +-
example/output-header/output-header.c | 9 +-
example/redirect-1/readme.txt | 3 +-
example/redirect-1/redirect-1.c | 15 +-
example/server-transform/server-transform.c | 11 +-
example/thread-1/thread-1.c | 3 +-
example/thread-pool/psi.c | 3 +-
iocore/aio/P_AIO.h | 4 -
iocore/aio/test_AIO.i | 2 +-
iocore/cache/Cache.cc | 13 -
iocore/cache/P_CacheVol.h | 4 -
iocore/cluster/test_I_Cluster.cc | 2 +-
iocore/cluster/test_P_Cluster.cc | 2 +-
iocore/dns/test_I_DNS.cc | 2 +-
iocore/eventsystem/I_EThread.h | 1 -
iocore/eventsystem/I_EventProcessor.h | 2 +-
iocore/eventsystem/I_ProxyAllocator.h | 2 +-
iocore/eventsystem/I_VConnection.h | 12 -
iocore/eventsystem/test_Buffer.cc | 6 +-
iocore/eventsystem/test_Event.i | 2 +-
iocore/hostdb/HostDB.cc | 17 -
iocore/hostdb/P_MultiCache.h | 15 -
iocore/hostdb/test_I_HostDB.cc | 2 +-
iocore/net/P_CompletionUtil.h | 2 -
iocore/net/P_SSLConfig.h | 12 -
iocore/net/P_SSLNetAccept.h | 3 -
iocore/net/P_SSLNetProcessor.h | 11 -
iocore/net/P_SSLNetVConnection.h | 4 -
iocore/net/P_Socks.h | 5 -
iocore/net/P_UDPNet.h | 44 ---
iocore/net/P_UnixCompletionUtil.h | 4 -
iocore/net/P_UnixUDPConnection.h | 3 -
iocore/net/SSLConfig.cc | 16 +-
iocore/net/test_I_Net.cc | 6 +-
iocore/net/test_I_UDPNet.cc | 2 +-
iocore/net/test_P_UDPNet.cc | 2 +-
iocore/utils/diags.i | 2 +-
lib/records/P_RecCompatibility.h | 9 -
lib/ts/ink_res_init.cc | 4 -
lib/ts/test_atomic.cc | 19 -
mgmt/Alarms.cc | 44 ---
mgmt/FileManager.cc | 51 +---
mgmt/LocalManager.cc | 17 +-
mgmt/LocalManager.h | 11 -
mgmt/Main.cc | 11 -
mgmt/MultiFile.cc | 37 --
mgmt/ProcessManager.cc | 55 ---
mgmt/ProcessManager.h | 12 -
mgmt/RecordsConfig.cc | 4 +-
mgmt/Rollback.cc | 87 +-----
mgmt/api/CoreAPI.cc | 3 -
mgmt/api/CoreAPIShared.cc | 50 +---
mgmt/api/GenericParser.cc | 4 -
mgmt/api/INKMgmtAPIStub.cc | 3 -
mgmt/api/include/mgmtapi.h | 13 +-
mgmt/api/remote/EventRegistration.cc | 4 -
mgmt/api/remote/EventRegistration.h | 3 -
mgmt/cli/cliAppInit.cc | 1 +
mgmt/cluster/ClusterCom.cc | 97 -----
mgmt/cluster/VMap.h | 54 ---
mgmt/preparse/IPRange.cc | 4 -
mgmt/utils/MgmtUtils.cc | 163 +--------
mgmt/utils/MgmtUtils.h | 5 -
mgmt/utils/WebMgmtUtils.cc | 41 +--
mgmt/web2/WebCompatibility.h | 9 -
mgmt/web2/WebHttp.cc | 66 +----
mgmt/web2/WebIntrMain.cc | 2 +-
mgmt/web2/WebUtils.cc | 9 -
proxy/CoreUtils.cc | 8 +-
proxy/ICP.cc | 48 +--
proxy/Initialize.cc | 2 +-
proxy/InkAPI.cc | 85 +++--
proxy/InkAPIInternal.h | 12 +-
proxy/InkAPITest.cc | 8 +-
proxy/InkIOCoreAPI.cc | 4 -
proxy/Main.cc | 2 +-
proxy/StatSystem.h | 30 --
proxy/Update.cc | 5 -
proxy/api/ts/ts.h.in | 21 +-
proxy/config/plugin.config.default | 4 +-
proxy/config/vaddrs.config.default | 9 -
proxy/config/winnt_intr.config.default | 17 -
proxy/hdrs/HTTP.cc | 158 ++++----
proxy/hdrs/HTTP.h | 2 +-
proxy/hdrs/HdrTest.cc | 6 -
proxy/http/HttpConfig.cc | 13 +-
proxy/http/HttpConfig.h | 66 ++--
proxy/http/HttpSM.cc | 25 +-
rc/trafficserver.conf.in | 2 +-
102 files changed, 531 insertions(+), 1755 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcef71e9/iocore/cache/Cache.cc
----------------------------------------------------------------------