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 06:15:26 UTC
[2/3] git commit: Merge branch 'master' into 934
Merge branch 'master' into 934
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/acdb96dc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/acdb96dc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/acdb96dc
Branch: refs/heads/master
Commit: acdb96dcb45b91827917cf56a57641a73505683a
Parents: 72ef2de 63cd828
Author: jplevyak@apache.org <jp...@apache.org>
Authored: Tue May 15 21:12:08 2012 -0700
Committer: John Plevyak <jp...@acm.org>
Committed: Tue May 15 21:12:08 2012 -0700
----------------------------------------------------------------------
CHANGES | 38 +-
configure.ac | 35 +
contrib/tstop/src/Makefile | 5 +
contrib/tstop/src/stats.h | 348 ++
contrib/tstop/src/tstop.cc | 349 ++
cop/TrafficCop.cc | 47 +-
example/add-header/Makefile.am | 2 +-
example/add-header/add-header.c | 3 +-
example/add-header/readme.txt | 3 +-
example/app-template/Makefile.am | 3 -
example/append-transform/Makefile.am | 2 +-
example/append-transform/append-transform.c | 7 +-
example/append-transform/readme.txt | 3 +-
example/basic-auth/Makefile.am | 2 +-
example/basic-auth/basic-auth.c | 46 +-
example/basic-auth/readme.txt | 4 +-
example/blacklist-0/Makefile.am | 2 +-
example/blacklist-1/Makefile.am | 2 +-
example/bnull-transform/Makefile.am | 2 +-
example/bnull-transform/bnull-transform.c | 3 +-
example/cache_scan/Makefile.am | 2 +-
example/file-1/Makefile.am | 2 +-
example/file-1/file-1.c | 3 +-
example/file-1/readme.txt | 3 +-
example/hello/Makefile.am | 2 +-
example/null-transform/Makefile.am | 2 +-
example/null-transform/null-transform.c | 3 +-
example/output-header/Makefile.am | 2 +-
example/output-header/output-header.c | 9 +-
example/prefetch/Makefile.am | 2 +-
example/protocol/Makefile.am | 2 +-
example/query_remap/Makefile.am | 2 +-
example/redirect-1/Makefile.am | 2 +-
example/redirect-1/readme.txt | 3 +-
example/redirect-1/redirect-1.c | 15 +-
example/remap/Makefile.am | 2 +-
example/replace-header/Makefile.am | 2 +-
example/response-header-1/Makefile.am | 2 +-
example/server-transform/Makefile.am | 2 +-
example/server-transform/server-transform.c | 11 +-
example/session-1/Makefile.am | 2 +-
example/thread-1/Makefile.am | 2 +-
example/thread-1/thread-1.c | 3 +-
example/thread-pool/Makefile.am | 2 +-
example/thread-pool/include/Makefile.am | 2 -
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/ClusterHandlerBase.cc | 5 +
iocore/cluster/ClusterProcessor.cc | 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/Connection.cc | 1 +
iocore/net/I_NetProcessor.h | 3 +
iocore/net/I_NetVConnection.h | 9 +-
iocore/net/P_CompletionUtil.h | 2 -
iocore/net/P_Connection.h | 3 +
iocore/net/P_NetAccept.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_UnixNetVConnection.h | 9 +-
iocore/net/P_UnixUDPConnection.h | 3 -
iocore/net/SSLConfig.cc | 16 +-
iocore/net/UnixConnection.cc | 42 +-
iocore/net/UnixNetAccept.cc | 20 +-
iocore/net/UnixNetProcessor.cc | 4 +
iocore/net/UnixNetVConnection.cc | 6 +
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/Makefile.am | 2 -
lib/ts/ink_config.h.in | 2 +
lib/ts/ink_isolatin_table.cc | 579 ---
lib/ts/ink_isolatin_table.h | 51 -
lib/ts/ink_res_init.cc | 4 -
lib/ts/libts.h | 1 -
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 | 16 +-
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 -
plugins/conf_remap/Makefile.am | 3 +-
plugins/header_filter/Makefile.am | 2 +-
plugins/regex_remap/Makefile.am | 2 +-
plugins/stats_over_http/Makefile.am | 2 +-
proxy/CoreUtils.cc | 8 +-
proxy/ICP.cc | 48 +-
proxy/Initialize.cc | 2 +-
proxy/InkAPI.cc | 198 +-
proxy/InkAPIInternal.h | 12 +-
proxy/InkAPITest.cc | 12 +-
proxy/InkIOCoreAPI.cc | 4 -
proxy/Main.cc | 2 +-
proxy/Plugin.cc | 7 -
proxy/PluginVC.cc | 6 +
proxy/PluginVC.h | 1 +
proxy/StatSystem.h | 30 -
proxy/UglyLogStubs.cc | 2 +
proxy/Update.cc | 5 -
proxy/api/ts/ts.h.in | 72 +-
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 | 19 +-
proxy/http/HttpConfig.h | 63 +-
proxy/http/HttpProxyServerMain.cc | 2 +
proxy/http/HttpSM.cc | 137 +-
proxy/http/HttpSM.h | 2 +
proxy/http/HttpTransact.cc | 4 +-
proxy/http/HttpTransact.h | 12 +-
proxy/logging/Log.cc | 24 +
proxy/logging/LogAccess.cc | 43 +
proxy/logging/LogAccess.h | 9 +
proxy/logging/LogAccessHttp.cc | 80 +-
proxy/logging/LogAccessHttp.h | 9 +
proxy/logging/LogConfig.cc | 24 +
proxy/logging/LogField.cc | 8 +
proxy/logging/LogField.h | 2 +
tools/jtest/Makefile | 7 +
tools/jtest/jtest.cc | 5826 ++++++++++++++++++++++
166 files changed, 7570 insertions(+), 2159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/acdb96dc/iocore/net/I_NetVConnection.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/acdb96dc/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------