You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2010/11/30 02:43:06 UTC
svn commit: r1040383 [1/38] - in /trafficserver/traffic/branches/wccp: ./
build/ contrib/ contrib/perl/AdminClient/lib/Apache/TS/ example/
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ exam...
Author: amc
Date: Tue Nov 30 01:42:55 2010
New Revision: 1040383
URL: http://svn.apache.org/viewvc?rev=1040383&view=rev
Log:
Merge with trunk:1026389 before commit back to trunk.
Added:
trafficserver/traffic/branches/wccp/proxy/api/ts/ts.h.in
- copied unchanged from r1040378, trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
trafficserver/traffic/branches/wccp/test/deft/ts-instantiate.pl
- copied unchanged from r1040378, trafficserver/traffic/trunk/test/deft/ts-instantiate.pl
trafficserver/traffic/branches/wccp/tsxs.in
- copied unchanged from r1040378, trafficserver/traffic/trunk/tsxs.in
Removed:
trafficserver/traffic/branches/wccp/example/cache_plugin/
trafficserver/traffic/branches/wccp/example/file_system_cache/
trafficserver/traffic/branches/wccp/iocore/cache/NewCacheVC.cc
trafficserver/traffic/branches/wccp/iocore/cache/NewCacheVC.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_spill.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_spill.h
trafficserver/traffic/branches/wccp/libinktomi++/llqueue.h
trafficserver/traffic/branches/wccp/proxy/CacheInspectorAllow.cc
trafficserver/traffic/branches/wccp/proxy/CacheInspectorAllow.h
trafficserver/traffic/branches/wccp/proxy/RniTransStats.h
trafficserver/traffic/branches/wccp/proxy/UserNameCacheTest.cc
trafficserver/traffic/branches/wccp/proxy/api/ts/ts.h
trafficserver/traffic/branches/wccp/proxy/api/ts/ts_private.h
trafficserver/traffic/branches/wccp/proxy/api/ts/ts_private_frozen.h
trafficserver/traffic/branches/wccp/proxy/config/logs.config
trafficserver/traffic/branches/wccp/proxy/cust_log_fmt_cnvrt.cc
trafficserver/traffic/branches/wccp/proxy/ts-instantiate.pl
trafficserver/traffic/branches/wccp/test/plugin/add-header-deprecated/Makefile.am
trafficserver/traffic/branches/wccp/test/plugin/add-header-deprecated/add-header.deprecated.c
trafficserver/traffic/branches/wccp/test/plugin/add-header-deprecated/readme.txt
trafficserver/traffic/branches/wccp/test/plugin/append-transform-deprecated/Makefile.am
trafficserver/traffic/branches/wccp/test/plugin/append-transform-deprecated/append-transform.deprecated.c
trafficserver/traffic/branches/wccp/test/plugin/append-transform-deprecated/readme.txt
trafficserver/traffic/branches/wccp/test/plugin/basic-auth-deprecated/Makefile.am
trafficserver/traffic/branches/wccp/test/plugin/basic-auth-deprecated/basic-auth.deprecated.c
trafficserver/traffic/branches/wccp/test/plugin/basic-auth-deprecated/readme.txt
trafficserver/traffic/branches/wccp/test/plugin/redirect-1-deprecated/Makefile.am
trafficserver/traffic/branches/wccp/test/plugin/redirect-1-deprecated/readme.txt
trafficserver/traffic/branches/wccp/test/plugin/redirect-1-deprecated/redirect-1.deprecated.c
Modified:
trafficserver/traffic/branches/wccp/ (props changed)
trafficserver/traffic/branches/wccp/.gitignore
trafficserver/traffic/branches/wccp/CHANGES
trafficserver/traffic/branches/wccp/Makefile.am
trafficserver/traffic/branches/wccp/STATUS
trafficserver/traffic/branches/wccp/build/ (props changed)
trafficserver/traffic/branches/wccp/configure.ac
trafficserver/traffic/branches/wccp/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/branches/wccp/contrib/set_trafficserver.sh
trafficserver/traffic/branches/wccp/example/ (props changed)
trafficserver/traffic/branches/wccp/example/Makefile.am
trafficserver/traffic/branches/wccp/example/add-header/ (props changed)
trafficserver/traffic/branches/wccp/example/add-header/add-header.c
trafficserver/traffic/branches/wccp/example/add-header/readme.txt
trafficserver/traffic/branches/wccp/example/app-template/ (props changed)
trafficserver/traffic/branches/wccp/example/app-template/app-template.cc
trafficserver/traffic/branches/wccp/example/append-transform/ (props changed)
trafficserver/traffic/branches/wccp/example/append-transform/append-transform.c
trafficserver/traffic/branches/wccp/example/append-transform/readme.txt
trafficserver/traffic/branches/wccp/example/basic-auth/ (props changed)
trafficserver/traffic/branches/wccp/example/basic-auth/basic-auth.c
trafficserver/traffic/branches/wccp/example/basic-auth/readme.txt
trafficserver/traffic/branches/wccp/example/blacklist-0/ (props changed)
trafficserver/traffic/branches/wccp/example/blacklist-0/blacklist-0.c
trafficserver/traffic/branches/wccp/example/blacklist-1/ (props changed)
trafficserver/traffic/branches/wccp/example/blacklist-1/blacklist-1.c
trafficserver/traffic/branches/wccp/example/bnull-transform/ (props changed)
trafficserver/traffic/branches/wccp/example/bnull-transform/bnull-transform.c
trafficserver/traffic/branches/wccp/example/cache_scan/ (props changed)
trafficserver/traffic/branches/wccp/example/cache_scan/cache_scan.cc
trafficserver/traffic/branches/wccp/example/file-1/ (props changed)
trafficserver/traffic/branches/wccp/example/file-1/file-1.c
trafficserver/traffic/branches/wccp/example/file-1/readme.txt
trafficserver/traffic/branches/wccp/example/gzip-transform/ (props changed)
trafficserver/traffic/branches/wccp/example/gzip-transform/gunzip.c
trafficserver/traffic/branches/wccp/example/gzip-transform/gzip.c
trafficserver/traffic/branches/wccp/example/hello/ (props changed)
trafficserver/traffic/branches/wccp/example/hello/hello.c
trafficserver/traffic/branches/wccp/example/include_other/ (props changed)
trafficserver/traffic/branches/wccp/example/include_other/macro.h
trafficserver/traffic/branches/wccp/example/null-transform/ (props changed)
trafficserver/traffic/branches/wccp/example/null-transform/null-transform.c
trafficserver/traffic/branches/wccp/example/null-transform/readme.txt
trafficserver/traffic/branches/wccp/example/output-header/ (props changed)
trafficserver/traffic/branches/wccp/example/output-header/output-header.c
trafficserver/traffic/branches/wccp/example/output-header/readme
trafficserver/traffic/branches/wccp/example/prefetch/ (props changed)
trafficserver/traffic/branches/wccp/example/prefetch/prefetch-plugin-eg1.c
trafficserver/traffic/branches/wccp/example/prefetch/test-hns-plugin.c
trafficserver/traffic/branches/wccp/example/protocol/ (props changed)
trafficserver/traffic/branches/wccp/example/protocol/Protocol.c
trafficserver/traffic/branches/wccp/example/protocol/TxnSM.c
trafficserver/traffic/branches/wccp/example/protocol/TxnSM.h
trafficserver/traffic/branches/wccp/example/query_remap/ (props changed)
trafficserver/traffic/branches/wccp/example/query_remap/query_remap.c
trafficserver/traffic/branches/wccp/example/redirect-1/ (props changed)
trafficserver/traffic/branches/wccp/example/redirect-1/redirect-1.c
trafficserver/traffic/branches/wccp/example/remap/ (props changed)
trafficserver/traffic/branches/wccp/example/remap/remap.cc
trafficserver/traffic/branches/wccp/example/replace-header/ (props changed)
trafficserver/traffic/branches/wccp/example/replace-header/replace-header.c
trafficserver/traffic/branches/wccp/example/response-header-1/ (props changed)
trafficserver/traffic/branches/wccp/example/response-header-1/response-header-1.c
trafficserver/traffic/branches/wccp/example/server-transform/ (props changed)
trafficserver/traffic/branches/wccp/example/server-transform/server-transform.c
trafficserver/traffic/branches/wccp/example/session-1/ (props changed)
trafficserver/traffic/branches/wccp/example/session-1/session-1.c
trafficserver/traffic/branches/wccp/example/thread-1/ (props changed)
trafficserver/traffic/branches/wccp/example/thread-1/readme.txt
trafficserver/traffic/branches/wccp/example/thread-1/thread-1.c
trafficserver/traffic/branches/wccp/example/thread-pool/ (props changed)
trafficserver/traffic/branches/wccp/example/thread-pool/psi.c
trafficserver/traffic/branches/wccp/example/thread-pool/test/SDKTest/psi_server.c
trafficserver/traffic/branches/wccp/example/thread-pool/thread.c
trafficserver/traffic/branches/wccp/example/thread-pool/thread.h
trafficserver/traffic/branches/wccp/iocore/aio/NTAIO.cc
trafficserver/traffic/branches/wccp/iocore/cache/Cache.cc
trafficserver/traffic/branches/wccp/iocore/cache/CachePages.cc
trafficserver/traffic/branches/wccp/iocore/cache/CachePagesInternal.cc
trafficserver/traffic/branches/wccp/iocore/cache/CacheTest.cc
trafficserver/traffic/branches/wccp/iocore/cache/I_Cache.h
trafficserver/traffic/branches/wccp/iocore/cache/Makefile.am
trafficserver/traffic/branches/wccp/iocore/cache/P_Cache.h
trafficserver/traffic/branches/wccp/iocore/cache/P_CacheDir.h
trafficserver/traffic/branches/wccp/iocore/cache/P_CacheInternal.h
trafficserver/traffic/branches/wccp/iocore/cache/P_CacheTest.h
trafficserver/traffic/branches/wccp/iocore/cluster/ClusterAPI.cc
trafficserver/traffic/branches/wccp/iocore/cluster/ClusterConfig.cc
trafficserver/traffic/branches/wccp/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/branches/wccp/iocore/cluster/ClusterVConnection.cc
trafficserver/traffic/branches/wccp/iocore/cluster/P_ClusterCache.h
trafficserver/traffic/branches/wccp/iocore/dns/DNS.cc
trafficserver/traffic/branches/wccp/iocore/dns/DNSConnection.cc
trafficserver/traffic/branches/wccp/iocore/dns/I_DNSProcessor.h
trafficserver/traffic/branches/wccp/iocore/dns/P_DNSConnection.h
trafficserver/traffic/branches/wccp/iocore/dns/P_DNSProcessor.h
trafficserver/traffic/branches/wccp/iocore/dns/SplitDNS.cc
trafficserver/traffic/branches/wccp/iocore/eventsystem/I_Event.h
trafficserver/traffic/branches/wccp/iocore/eventsystem/I_EventProcessor.h
trafficserver/traffic/branches/wccp/iocore/eventsystem/I_Lock.h
trafficserver/traffic/branches/wccp/iocore/eventsystem/I_ProxyAllocator.h
trafficserver/traffic/branches/wccp/iocore/eventsystem/P_IOBuffer.h
trafficserver/traffic/branches/wccp/iocore/eventsystem/P_UnixEventProcessor.h
trafficserver/traffic/branches/wccp/iocore/eventsystem/UnixEventProcessor.cc
trafficserver/traffic/branches/wccp/iocore/hostdb/HostDB.cc
trafficserver/traffic/branches/wccp/iocore/net/Connection.cc
trafficserver/traffic/branches/wccp/iocore/net/I_NetProcessor.h
trafficserver/traffic/branches/wccp/iocore/net/I_NetVConnection.h
trafficserver/traffic/branches/wccp/iocore/net/I_UDPPacket.h
trafficserver/traffic/branches/wccp/iocore/net/Makefile.am
trafficserver/traffic/branches/wccp/iocore/net/P_Connection.h
trafficserver/traffic/branches/wccp/iocore/net/P_Net.h
trafficserver/traffic/branches/wccp/iocore/net/P_NetAccept.h
trafficserver/traffic/branches/wccp/iocore/net/P_NetVConnection.h
trafficserver/traffic/branches/wccp/iocore/net/P_SSLNetAccept.h
trafficserver/traffic/branches/wccp/iocore/net/P_SSLNetProcessor.h
trafficserver/traffic/branches/wccp/iocore/net/P_SSLNetVConnection.h
trafficserver/traffic/branches/wccp/iocore/net/P_UDPPacket.h
trafficserver/traffic/branches/wccp/iocore/net/P_UnixNet.h
trafficserver/traffic/branches/wccp/iocore/net/P_UnixNetProcessor.h
trafficserver/traffic/branches/wccp/iocore/net/P_UnixNetVConnection.h
trafficserver/traffic/branches/wccp/iocore/net/SSLNet.cc
trafficserver/traffic/branches/wccp/iocore/net/SSLNetVConnection.cc
trafficserver/traffic/branches/wccp/iocore/net/SSLUnixNet.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixConnection.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixNet.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixNetAccept.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixNetPages.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixNetProcessor.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixNetVConnection.cc
trafficserver/traffic/branches/wccp/iocore/net/UnixUDPNet.cc
trafficserver/traffic/branches/wccp/libinktomi++/ (props changed)
trafficserver/traffic/branches/wccp/libinktomi++/Allocator.cc
trafficserver/traffic/branches/wccp/libinktomi++/Allocator.h
trafficserver/traffic/branches/wccp/libinktomi++/Diags.cc
trafficserver/traffic/branches/wccp/libinktomi++/Diags.h
trafficserver/traffic/branches/wccp/libinktomi++/Makefile.am
trafficserver/traffic/branches/wccp/libinktomi++/MatcherUtils.cc
trafficserver/traffic/branches/wccp/libinktomi++/Resource.cc
trafficserver/traffic/branches/wccp/libinktomi++/Resource.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_atomic.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_config.h.in
trafficserver/traffic/branches/wccp/libinktomi++/ink_hrtime.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_inet.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_inet.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_inout.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_memory.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_memory.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_mutex.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_queue.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_queue.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_queue_utils.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_res_init.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_resolver.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_resource.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_stack_trace.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_string++.cc
trafficserver/traffic/branches/wccp/libinktomi++/ink_string.h
trafficserver/traffic/branches/wccp/libinktomi++/ink_thread.h
trafficserver/traffic/branches/wccp/libinktomi++/inktomi++.h
trafficserver/traffic/branches/wccp/libinktomi++/mkdfa.c
trafficserver/traffic/branches/wccp/librecords/P_RecCore.h
trafficserver/traffic/branches/wccp/librecords/P_RecDefs.h
trafficserver/traffic/branches/wccp/librecords/RecCore.cc
trafficserver/traffic/branches/wccp/proxy/ControlMatcher.cc
trafficserver/traffic/branches/wccp/proxy/DiagsConfig.cc
trafficserver/traffic/branches/wccp/proxy/DynamicStats.h
trafficserver/traffic/branches/wccp/proxy/FetchSM.cc
trafficserver/traffic/branches/wccp/proxy/FetchSM.h
trafficserver/traffic/branches/wccp/proxy/ICP.cc
trafficserver/traffic/branches/wccp/proxy/ICP.h
trafficserver/traffic/branches/wccp/proxy/ICPConfig.cc
trafficserver/traffic/branches/wccp/proxy/Initialize.cc
trafficserver/traffic/branches/wccp/proxy/Initialize.h
trafficserver/traffic/branches/wccp/proxy/InkAPI.cc
trafficserver/traffic/branches/wccp/proxy/InkAPIInternal.h
trafficserver/traffic/branches/wccp/proxy/InkAPITest.cc
trafficserver/traffic/branches/wccp/proxy/InkAPITestTool.cc
trafficserver/traffic/branches/wccp/proxy/InkIOCoreAPI.cc
trafficserver/traffic/branches/wccp/proxy/InkXml.cc
trafficserver/traffic/branches/wccp/proxy/Main.cc
trafficserver/traffic/branches/wccp/proxy/Main.h
trafficserver/traffic/branches/wccp/proxy/Makefile.am
trafficserver/traffic/branches/wccp/proxy/Plugin.cc
trafficserver/traffic/branches/wccp/proxy/PluginVC.cc
trafficserver/traffic/branches/wccp/proxy/PluginVC.h
trafficserver/traffic/branches/wccp/proxy/Prefetch.cc
trafficserver/traffic/branches/wccp/proxy/Prefetch.h
trafficserver/traffic/branches/wccp/proxy/SimpleHttp.cc
trafficserver/traffic/branches/wccp/proxy/StatAPITypes.h
trafficserver/traffic/branches/wccp/proxy/StatPages.cc
trafficserver/traffic/branches/wccp/proxy/StatSystem.cc
trafficserver/traffic/branches/wccp/proxy/StatSystem.h
trafficserver/traffic/branches/wccp/proxy/StatSystemV2.cc
trafficserver/traffic/branches/wccp/proxy/StatSystemV2.h
trafficserver/traffic/branches/wccp/proxy/StateEventLogger.cc
trafficserver/traffic/branches/wccp/proxy/StateEventLogger.h
trafficserver/traffic/branches/wccp/proxy/Stuffer.cc
trafficserver/traffic/branches/wccp/proxy/StufferUdpReceiver.cc
trafficserver/traffic/branches/wccp/proxy/Transform.cc
trafficserver/traffic/branches/wccp/proxy/Transform.h
trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.cc
trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.h
trafficserver/traffic/branches/wccp/proxy/UDPAPITest.cc
trafficserver/traffic/branches/wccp/proxy/UDPAPITest.h
trafficserver/traffic/branches/wccp/proxy/api/ts/ (props changed)
trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIHughes.h
trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIPrivateIOCore.h
trafficserver/traffic/branches/wccp/proxy/api/ts/experimental.h
trafficserver/traffic/branches/wccp/proxy/api/ts/remap.h
trafficserver/traffic/branches/wccp/proxy/config/ (props changed)
trafficserver/traffic/branches/wccp/proxy/config/Makefile.am
trafficserver/traffic/branches/wccp/proxy/config/cache.config
trafficserver/traffic/branches/wccp/proxy/config/congestion.config
trafficserver/traffic/branches/wccp/proxy/config/logs_xml.config
trafficserver/traffic/branches/wccp/proxy/config/records.config.in
trafficserver/traffic/branches/wccp/proxy/congest/Congestion.cc
trafficserver/traffic/branches/wccp/proxy/congest/Makefile.am
trafficserver/traffic/branches/wccp/proxy/hdrs/HTTP.cc
trafficserver/traffic/branches/wccp/proxy/hdrs/HTTP.h
trafficserver/traffic/branches/wccp/proxy/hdrs/HdrHeap.cc
trafficserver/traffic/branches/wccp/proxy/hdrs/HdrHeap.h
trafficserver/traffic/branches/wccp/proxy/hdrs/MIME.cc
trafficserver/traffic/branches/wccp/proxy/hdrs/Makefile.am
trafficserver/traffic/branches/wccp/proxy/hdrs/URL.cc
trafficserver/traffic/branches/wccp/proxy/hdrs/URL.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpAccept.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpClientSession.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpClientSession.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpConfig.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpConfig.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpConnectionCount.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpDebugNames.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpDebugNames.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpPages.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpProxyServerMain.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpProxyServerMain.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpSM.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpSM.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpServerSession.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpServerSession.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpTransact.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpTransact.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpTransactCache.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpTransactHeaders.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpTransactHeaders.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpTunnel.cc
trafficserver/traffic/branches/wccp/proxy/http2/HttpTunnel.h
trafficserver/traffic/branches/wccp/proxy/http2/HttpUpdateSM.cc
trafficserver/traffic/branches/wccp/proxy/http2/Makefile.am
trafficserver/traffic/branches/wccp/proxy/http2/remap/ (props changed)
trafficserver/traffic/branches/wccp/proxy/http2/remap/RemapPlugins.cc
trafficserver/traffic/branches/wccp/proxy/logging/Log.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogAccess.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogAccess.h
trafficserver/traffic/branches/wccp/proxy/logging/LogAccessHttp.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogAccessHttp.h
trafficserver/traffic/branches/wccp/proxy/logging/LogBuffer.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogCollationAccept.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogCollationClientSM.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogCollationHostSM.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogConfig.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogConfig.h
trafficserver/traffic/branches/wccp/proxy/logging/LogField.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogFile.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogFilter.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogFilter.h
trafficserver/traffic/branches/wccp/proxy/logging/LogFormat.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogHost.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogObject.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogObject.h
trafficserver/traffic/branches/wccp/proxy/logging/LogSock.cc
trafficserver/traffic/branches/wccp/proxy/logging/LogStandalone.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/AddConfigFilesHere.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/LocalManager.h
trafficserver/traffic/branches/wccp/proxy/mgmt2/Main.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/RecordsConfig.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/GenericParser.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPI.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/INKMgmtAPIStub.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/MgmtPlugin.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/APITestCliRemote.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/api2/remote/Makefile.am
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CLImonitor.h
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli/CliMain.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.h
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ShowCmd.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/cli_detailed_command_list.txt
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.sh
trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.tcl
trafficserver/traffic/branches/wccp/proxy/mgmt2/cop/TrafficCop.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/html2/english.dict
trafficserver/traffic/branches/wccp/proxy/mgmt2/preparse/RemapReadConfig.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/tools/ConfigAPI.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/uistats
trafficserver/traffic/branches/wccp/proxy/mgmt2/utils/MgmtUtils.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfig.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfigRender.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebGlobals.h
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpLog.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.h
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebIntrMain.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.cc
trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.h
trafficserver/traffic/branches/wccp/proxy/signals.cc
trafficserver/traffic/branches/wccp/test/SDKtest/client/ClientAPI.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.cc
trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/Defines.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.cc
trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/LoadGenerator.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/Main.cc
trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.cc
trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/BlackList.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend-1.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckContentClient.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckReplaceHeader.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/ClientAPI.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/RequestList.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-0.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-1.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBench.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBenchCache.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtest.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtestCache.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SingleHostFilter.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/connection_finish.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/header_process.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/hello_world.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/internal/CheckAppend.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/internal/CheckReplaceHeader.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/internal/ClientAPI.h
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/internal/TestCacheAPI.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/options_process.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/options_process_finish.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/partial_body_process.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/plugin_finish.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/readme
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/report.c
trafficserver/traffic/branches/wccp/test/SDKtest/client/api/request_create.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/ServerAPI.h
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/CheckContentServer.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/LogRequest.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/ServerAPI.h
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/SimSynthServer.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/SimSynthServerCache.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/hello_world.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/options_process.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/options_process_finish.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/plugin_finish.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/readme
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/api/response_prepare.c
trafficserver/traffic/branches/wccp/test/SDKtest/synth_server/synth_server.c
trafficserver/traffic/branches/wccp/test/deft/docs/test_tool_docs.html
trafficserver/traffic/branches/wccp/test/deft/proc_manager.cc
trafficserver/traffic/branches/wccp/test/plugin/CacheAPITester/CacheAPITester.c
trafficserver/traffic/branches/wccp/test/plugin/CacheAPITester/CacheAPITester.h
trafficserver/traffic/branches/wccp/test/plugin/INKAction/INKAction.cc
trafficserver/traffic/branches/wccp/test/plugin/INKAction/README.txt
trafficserver/traffic/branches/wccp/test/plugin/INKContLeak/wapnet.c
trafficserver/traffic/branches/wccp/test/plugin/INKContinuations/INKContSchedule.c
trafficserver/traffic/branches/wccp/test/plugin/INKContinuations/ServerSM.cc
trafficserver/traffic/branches/wccp/test/plugin/INKContinuations/mod.Sched
trafficserver/traffic/branches/wccp/test/plugin/INKFopen/INKFopen.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpHook.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/INKProto.c
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/README.txt
trafficserver/traffic/branches/wccp/test/plugin/INKHttpHooksTrans/altSelect.notes
trafficserver/traffic/branches/wccp/test/plugin/INKNetConnect/INKNetConnectTest.c
trafficserver/traffic/branches/wccp/test/plugin/INKNetConnect/INKqa8418.c
trafficserver/traffic/branches/wccp/test/plugin/alt-info/alt-info.c
trafficserver/traffic/branches/wccp/test/plugin/alt-info/alt_info_spec.htm
trafficserver/traffic/branches/wccp/test/plugin/assembly/assembly.c
trafficserver/traffic/branches/wccp/test/plugin/assembly/common.h
trafficserver/traffic/branches/wccp/test/plugin/assembly/headers.c
trafficserver/traffic/branches/wccp/test/plugin/assembly/headers.h
trafficserver/traffic/branches/wccp/test/plugin/assembly/list.c
trafficserver/traffic/branches/wccp/test/plugin/blacklist-1-neg/blacklist-1-neg.c
trafficserver/traffic/branches/wccp/test/plugin/check-constants/check-constants.c
trafficserver/traffic/branches/wccp/test/plugin/check-http/check-http-0.c
trafficserver/traffic/branches/wccp/test/plugin/check-mime-1/check-mime-1.c
trafficserver/traffic/branches/wccp/test/plugin/check-mime-1/check_mime_1_spec.htm
trafficserver/traffic/branches/wccp/test/plugin/check-mime/check-mime-0.c
trafficserver/traffic/branches/wccp/test/plugin/check-mime/check-mime.c
trafficserver/traffic/branches/wccp/test/plugin/check-url/check-url-0.c
trafficserver/traffic/branches/wccp/test/plugin/climate/climate.c
trafficserver/traffic/branches/wccp/test/plugin/climate/events.h
trafficserver/traffic/branches/wccp/test/plugin/cluster-RPC/clusterRPC.c
trafficserver/traffic/branches/wccp/test/plugin/include_other/macro.h
trafficserver/traffic/branches/wccp/test/plugin/lookup/lookup.c
trafficserver/traffic/branches/wccp/test/plugin/order/README.txt
trafficserver/traffic/branches/wccp/test/plugin/order/orderplugin1.c
trafficserver/traffic/branches/wccp/test/plugin/order/orderplugin2.c
trafficserver/traffic/branches/wccp/test/plugin/order/orderplugin3.c
trafficserver/traffic/branches/wccp/test/plugin/order/orderplugin4.c
trafficserver/traffic/branches/wccp/test/plugin/order/orderstartplugin.c
trafficserver/traffic/branches/wccp/test/plugin/plugin_as_origin/http_connect_bridge.c
trafficserver/traffic/branches/wccp/test/plugin/plugin_as_origin/net_bridge.c
trafficserver/traffic/branches/wccp/test/plugin/plugin_as_origin/serve_file.c
trafficserver/traffic/branches/wccp/test/plugin/plugin_as_origin/test_dealloc.c
trafficserver/traffic/branches/wccp/test/plugin/redirect-1-neg/redirect-1-neg.c
trafficserver/traffic/branches/wccp/test/plugin/session-2/session-2.c
trafficserver/traffic/branches/wccp/test/plugin/session-2/session_2_spec.htm
trafficserver/traffic/branches/wccp/test/plugin/test-mgmt/test-mgmt.c
trafficserver/traffic/branches/wccp/test/plugin/test-protocol/test-protocol.c
trafficserver/traffic/branches/wccp/test/plugin/test-protocol/test-protocol.cc
trafficserver/traffic/branches/wccp/test/plugin/test-protocol/test-protocol.h
trafficserver/traffic/branches/wccp/test/plugin/test-protocol/test_protocol_spec.htm
trafficserver/traffic/branches/wccp/test/plugin/test-transform/test-transform.c
trafficserver/traffic/branches/wccp/test/plugin/test-transform/test_transform_spec.htm
trafficserver/traffic/branches/wccp/test/plugin/write-server-ip/write-server-ip.c
trafficserver/traffic/branches/wccp/test/plugin/write-server-ip/write_server_ip_spec.htm
Propchange: trafficserver/traffic/branches/wccp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -6,6 +6,8 @@ Makefile.in
tags
config.log
config.status
+config.nice
+tsxs
libtool
Makefile
install
Propchange: trafficserver/traffic/branches/wccp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 01:42:55 2010
@@ -1,3 +1,3 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
-/trafficserver/traffic/trunk:1021790-1026380
+/trafficserver/traffic/trunk:1021790-1026380,1026389-1040378
Modified: trafficserver/traffic/branches/wccp/.gitignore
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/.gitignore?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/.gitignore (original)
+++ trafficserver/traffic/branches/wccp/.gitignore Tue Nov 30 01:42:55 2010
@@ -78,10 +78,13 @@ rc/trafficserver
rc/update_records
proxy/api/include/ts
+proxy/api/ts/ts.h
example/*/.libs
example/app-template/tsapp
example/app-template/records.config
+tsxs
+
GPATH
GRTAGS
GSYMS
Modified: trafficserver/traffic/branches/wccp/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/CHANGES?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/CHANGES (original)
+++ trafficserver/traffic/branches/wccp/CHANGES Tue Nov 30 01:42:55 2010
@@ -1,7 +1,192 @@
-*- coding: utf-8 -*-
+Changes with Apache Traffic Server 2.1.5
+
+ *) The old logs.config custom log format is no longer supported. Only
+ the XML custom logs are now supported. This eliminates the config
+
+ proxy.config.log.xml_logs_config
+
+ as well, since it's the only option for custom logs [TS-556].
+
+ *) All log configurations (and stats) are renamed from log2.* to
+ log.*. This is to avoid confusion, since Apache Traffic Server never
+ had the old (obsolete) log system. There's now only one log system,
+ log [TS-555].
+
+ *) Many fixes and improvements on the Stats pages subsystem. This now
+ properly supports (if configured) various internal URLs, like
+ http://{net}, http://{hostdb} etc. [TS-554].
+
+ *) The NewCacheVC is removed [TS-551].
+
+ *) Support for the Alpha processor is eliminated [TS-552].
+
+ *) A number of unecessary memory allocations are removed, improving
+ performance under heavy load. [TS-550, TS-549]
+
+ *) All streaming media (MIXT) configurations are now properly removed
+ from code and default configs [TS-544].
+
+ *) URL scheme was case sensitive in the cache key [TS-474].
+
+ *) Fixes for broken API signatures, additions / modifications to the
+ following API:
+
+ TSReturnCode TSHttpTxnArgSet(TSHttpTxn txnp, int arg_idx, void *arg);
+ TSReturnCode TSHttpTxnArgGet(TSHttpTxn txnp, int arg_idx, void **argp);
+ TSReturnCode TSHttpSsnArgSet(TSHttpSsn ssnp, int arg_idx, void *arg);
+ TSReturnCode TSHttpSsnArgGet(TSHttpSsn ssnp, int arg_idx, void **argp);
+
+ TSReturnCode TSHttpArgIndexReserve(const char* name, const char* description, int* arg_idx);
+ TSReturnCode TSHttpArgIndexNameLookup(const char* name, int* arg_idx, const char** description);
+ TSReturnCode TSHttpArgIndexLookup(int arg_idx, const char** name, const char** description);
+
+ TSReturnCode TSHttpSsnTransactionCount(TSHttpSsn ssnp, int* count);
+
+ This was all combine into [TS-504], but also see [TS-503].
+
+ *) Many fixes for broken regression tests!
+
+ *) RNI is now completely cleaned out [TS-536].
+
+ *) Fixes for SplitDNS (co-author: mohan_zl) [TS-435].
+
+ *) HTTPS to origin servers, with Chunked responses, would hang [TS-540].
+
+ *) Mismatched APIs using "unsigned char*" [TS-458].
+
+ *) Rename / modify TSSetCacheUrl() API, the new prototype is
+
+ TSReturnCode TSCacheUrlSet(TSHttpTxn txnp, const char *url, int length);
+
+ If length == -1, then the API will calculate it using strlen() [TS-520].
+
+ *) All public APIs, structs and defines are now prefixed with "TS"
+ instead of the old "INK". There are two exceptions, for the
+ deprecated INKStats* and INKCoupledStats* APIs [TS-521].
+
+ *) The hooks around "remap" has been organized, and a new hook as been
+ added (for post-remap). New / renamed hooks are
+
+ TS_HTTP_PRE_REMAP_HOOK
+ TS_HTTP_POST_REMAP_HOOK
+
+ In addition, a new API was added, to allow a plugin to skip the remap
+ phase completely:
+
+ TSReturnCode TSSkipRemappingSet(TSHttpTxn txnp, int flag);
+
+ These fixes went in with [TS-529] and [TS-530].
+
+ *) INKHttpTxnSetHttpRetStatus not honored when an API transaction is
+ reenabled with INK_EVENT_HTTP_ERROR [TS-535].
+
+ *) Various defines for version identification has been moved to the
+ public ts/ts.h include file, e.g.
+
+ #define TS_VERSION_STRING "2.1.5-unstable"
+ #define TS_VERSION_NUMBER 2001005
+ #define TS_VERSION_MAJOR 2
+ #define TS_VERSION_MINOR 1
+ #define TS_VERSION_MICRO 5
+
+ The intended use is for plugins to be able to verify available APIs
+ at compile time (vs the existing runtime checks) [TS-534].
+
+ *) Traffic Server should now build on ARM processors. Commit message
+ is appropriately describing the situation with this CPU:
+
+ This is a sad day of defeat. Not my defeat, but more a collective
+ human defeat.
+
+ Question: "Chips fabricated today don't have 64bit atomic primitives?"
+ Answer: "Be sad."
+
+ The ARM box we're working on (armv5tejl) doesn't support any 64bit
+ primitives.
+
+ This means we need a method of using a global (yes, giant lock of
+ death) to protect modifications of arbitrary 64bit integers in
+ process space. We could make this less contentious by allocating
+ pagesize/8 mutexs and then protecting an int64 based on its page
+ offset. Instead, I think we should mobilize to burn these
+ architectures to the ground and use public embarrassment to fix
+ future instruction sets. If another platform has this issue, we'll
+ want to change the define to:
+
+ TS_ARCHITECTURE_LACKS_64BIT_INSTRUCTIONS and turn on the global death
+ lock based on that.
+
+ This does not change performance on any other platform -- it's
+ compile time capital punishment. [TS-533] and [TS-135].
+
+ *) Very old APIs, that have been deprecated since long before the
+ Apache Open Source project, are removed. Also, only three public
+ include files are now available:
+
+ ts/ts.h
+ ts/experimental.h
+ ts/remap.h
+
+ Various other cleanup related to the APIs was also done [TS-522].
+
+
Changes with Apache Traffic Server 2.1.4
+ *) Fixes to clustering, that caused an assert to trigger after the
+ stats changes [TS-519].
+
+ *) Make the checks when to honor the Content-Length: header less
+ strict, against origins without Keep-Alive [TS-500].
+
+ *) Eliminate old ssl_ports feature, it's completely replaced with the
+ connect_ports configuration [TS-517].
+
+ *) New script available to help build plugins, tsxs [TS-512].
+
+ *) Simple, brute force (and efficient) status code stats counters
+ [TS-509].
+
+ *) Generalize RecDumpRecordsHt to use RecDumpRecords which is a
+ callback/map pattern [TS-508].
+
+ *) Fix plugin APIs to be compatible with the 64-bit changes in the
+ core. This is an incompatible change with previous releases [TS-14].
+
+ *) Fixes for stats around origin connection counters, used when
+ allowing for origin connections to be reused between clients [TS-501].
+
+ *) Experimental supoprt for a dedicated DNS thread. This can be
+ enabled with the records.config option
+
+ CONFIG proxy.config.dns.dedicated_thread INT 1
+
+ This feature is possibly useful for very busy forward or transparent
+ proxies [TS-307].
+
+ *) Accept threads can leak some amount of memory. This patch also
+ supports multiple accept threads (very experimental!) [TS-496].
+
+ *) HttpSM has an assertion that checks the client URL against the
+ cache URL, which breaks INKSetCacheUrl [TS-495].
+
+ *) Return value from pcre_exec tested incorrectly [TS-493].
+
+ *) Improved loop detection using the Via header [TS-490].
+
+ *) Fixes for Solaris build (yay, it builds!).
+
+ *) Remove filter.config remnants [TS-486].
+
+ *) Cleanup in InkAPI [TS-485].
+
+ *) Move PKGSYSUSER to ink_config.h.in [TS-482].
+
+ *) Unresponsive server can stall ATS [TS-480].
+
+ *) UrlRewrite cleanup [TS-434].
+
*) Build TS with clang (author: Igor Galic) [TS-427].
*) Better support and handling of DNS round-robin options (author: Zhao
@@ -20,6 +205,7 @@ Changes with Apache Traffic Server 2.1.4
*) Cleanup / optimize Via: string generation [TS-460]. Also make the
default for Via: on responses to be disabled (it can leak info).
+
Changes with Apache Traffic Server 2.1.3
*) Removed the remnants of NCA from the source [TS-455].
@@ -95,6 +281,7 @@ Changes with Apache Traffic Server 2.1.3
*) Duplication of RAM cache hits and miss statistics (reading 2x) (author: John
Plevyak) [TS-453].
+
Changes with Apache Traffic Server 2.1.2
*) Improvements in resilience against DNS poisoning and forging of
Modified: trafficserver/traffic/branches/wccp/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/Makefile.am?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/Makefile.am (original)
+++ trafficserver/traffic/branches/wccp/Makefile.am Tue Nov 30 01:42:55 2010
@@ -36,6 +36,8 @@ EXTRA_DIST=CHANGES INSTALL STATUS NOTICE
installcheck-local:
$(DESTDIR)$(bindir)/traffic_server -R 1
+install-exec-local:
+ $(INSTALL) -m 0755 tsxs $(DESTDIR)$(bindir)/tsxs
doxygen:
$(MAKE) -C doc doxygen
Modified: trafficserver/traffic/branches/wccp/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/STATUS?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/STATUS (original)
+++ trafficserver/traffic/branches/wccp/STATUS Tue Nov 30 01:42:55 2010
@@ -10,6 +10,7 @@ Release history:
[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
while x.{even}.z versions are Stable/GA releases.]
+ 2.1.4-unstable : Released on November 12, 2010
2.1.3-unstable : Released on September 23, 2010
2.1.2-unstable : Released on August 31, 2010
2.1.1-unstable : Released on June 7, 2010
@@ -34,7 +35,7 @@ RELEASE SHOWSTOPPERS:
A list of all bugs scheduled for the next release can be found at
- http://s.apache.org/ts-2.1.3
+ http://s.apache.org/ts-2.1.5
RELEASE PROCESS
Propchange: trafficserver/traffic/branches/wccp/build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -0,0 +1,6 @@
+aux
+libtool.m4
+lt~obsolete.m4
+ltsugar.m4
+ltversion.m4
+ltoptions.m4
Modified: trafficserver/traffic/branches/wccp/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/configure.ac?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/configure.ac (original)
+++ trafficserver/traffic/branches/wccp/configure.ac Tue Nov 30 01:42:55 2010
@@ -32,8 +32,8 @@
# Version number is calculated as MAJOR * 1000000 + MINOR * 1000 + MICRO
# Version string is in the form of MAJOR.MINOR.MICRO[sufix]
#
-m4_define([TS_VERSION_S],[2.1.4-unstable])
-m4_define([TS_VERSION_N],[2001004])
+m4_define([TS_VERSION_S],[2.1.5-unstable])
+m4_define([TS_VERSION_N],[2001005])
AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org])
AC_PREREQ([2.59])
@@ -98,6 +98,8 @@ TS_PARSE_ARGUMENTS
# Host detection
#
AC_CANONICAL_HOST
+HOST_GUESS="$host"
+AC_SUBST(HOST_GUESS)
#
# Build environment
@@ -161,6 +163,23 @@ AC_MSG_RESULT([$enable_diags])
AC_SUBST(use_diags)
#
+# Build regression tests?
+#
+
+has_tests=0
+AC_MSG_CHECKING([whether to enable regression tests])
+AC_ARG_ENABLE([tests],
+ [AS_HELP_STRING([--disable-tests],[turn off regression tests])],
+ [],
+ [enable_tests="yes"
+ has_tests=1
+ ]
+)
+AC_MSG_RESULT([$enable_tests])
+AC_SUBST(has_tests)
+AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" = "xyes"])
+
+#
# Purify
#
has_purify=0
@@ -1172,6 +1191,8 @@ AC_SUBST([TFW_PACKAGE_SUFFIX])
# -----------------------------------------------------------------------------
# 6. OUTPUT FILES
+AC_CONFIG_FILES([libinktomi++/ink_config.h proxy/api/ts/ts.h])
+AC_CONFIG_FILES([tsxs])
AC_CONFIG_FILES([doc/Doxyfile])
AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([rc/Makefile])
@@ -1185,14 +1206,12 @@ AC_CONFIG_FILES([iocore/hostdb/Makefile]
AC_CONFIG_FILES([iocore/Makefile])
AC_CONFIG_FILES([iocore/net/Makefile])
AC_CONFIG_FILES([iocore/utils/Makefile])
-AC_CONFIG_FILES([libinktomi++/ink_config.h])
AC_CONFIG_FILES([libinktomi++/Makefile])
AC_CONFIG_FILES([librecords/Makefile])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([proxy/config/body_factory/default/Makefile])
AC_CONFIG_FILES([proxy/config/body_factory/Makefile])
-AC_CONFIG_FILES([proxy/config/records.config])
-AC_CONFIG_FILES([proxy/config/storage.config])
+AC_CONFIG_FILES([proxy/config/records.config proxy/config/storage.config])
AC_CONFIG_FILES([proxy/config/Makefile])
AC_CONFIG_FILES([proxy/congest/Makefile])
AC_CONFIG_FILES([proxy/hdrs/Makefile])
@@ -1235,10 +1254,8 @@ AC_CONFIG_FILES([example/basic-auth/Make
AC_CONFIG_FILES([example/blacklist-0/Makefile])
AC_CONFIG_FILES([example/blacklist-1/Makefile])
AC_CONFIG_FILES([example/bnull-transform/Makefile])
-AC_CONFIG_FILES([example/cache_plugin/Makefile])
AC_CONFIG_FILES([example/cache_scan/Makefile])
AC_CONFIG_FILES([example/file-1/Makefile])
-AC_CONFIG_FILES([example/file_system_cache/Makefile])
AC_CONFIG_FILES([example/gzip-transform/Makefile])
AC_CONFIG_FILES([example/hello/Makefile])
AC_CONFIG_FILES([example/null-transform/Makefile])
@@ -1255,8 +1272,7 @@ AC_CONFIG_FILES([example/session-1/Makef
AC_CONFIG_FILES([example/thread-1/Makefile])
AC_CONFIG_FILES([example/thread-pool/Makefile])
# example app w/ standalone iocore
-AC_CONFIG_FILES([example/app-template/Makefile])
-AC_CONFIG_FILES([example/app-template/records.config])
+AC_CONFIG_FILES([example/app-template/Makefile example/app-template/records.config])
# -----------------------------------------------------------------------------
# 7. autoheader TEMPLATES
Modified: trafficserver/traffic/branches/wccp/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/branches/wccp/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Tue Nov 30 01:42:55 2010
@@ -472,8 +472,7 @@ The Apache Traffic Server Administration
proxy.config.http.share_server_sessions
proxy.config.http.slow.log.threshold
proxy.config.http.snarf_username_from_authorization
- proxy.config.http.ssl_ports
- proxy.config.http.streaming_connect_attempts_timeout
+ proxy.config.http.connect_ports
proxy.config.http.transaction_active_timeout_in
proxy.config.http.transaction_active_timeout_out
proxy.config.http.transaction_no_activity_timeout_in
@@ -498,63 +497,61 @@ The Apache Traffic Server Administration
proxy.config.lm.pserver_timeout_secs
proxy.config.lm.sem_id
proxy.config.local_state_dir
- proxy.config.log2.ascii_buffer_size
- proxy.config.log2.auto_delete_rolled_files
- proxy.config.log2.collation_host
- proxy.config.log2.collation_host_tagged
- proxy.config.log2.collation_max_send_buffers
- proxy.config.log2.collation_port
- proxy.config.log2.collation_retry_sec
- proxy.config.log2.collation_secret
- proxy.config.log2.common_log_enabled
- proxy.config.log2.common_log_header
- proxy.config.log2.common_log_is_ascii
- proxy.config.log2.common_log_name
- proxy.config.log2.config_file
- proxy.config.log2.custom_logs_enabled
- proxy.config.log2.extended2_log_enabled
- proxy.config.log2.extended2_log_header
- proxy.config.log2.extended2_log_is_ascii
- proxy.config.log2.extended2_log_name
- proxy.config.log2.extended_log_enabled
- proxy.config.log2.extended_log_header
- proxy.config.log2.extended_log_is_ascii
- proxy.config.log2.extended_log_name
- proxy.config.log2.file_stat_frequency
- proxy.config.log2.hostname
- proxy.config.log2.hosts_config_file
- proxy.config.log2.log_buffer_size
- proxy.config.log2.logfile_dir
- proxy.config.log2.logfile_perm
- proxy.config.log2.logging_enabled
- proxy.config.log2.max_entries_per_buffer
- proxy.config.log2.max_line_size
- proxy.config.log2.max_secs_per_buffer
- proxy.config.log2.max_space_mb_for_logs
- proxy.config.log2.max_space_mb_for_orphan_logs
- proxy.config.log2.max_space_mb_headroom
- proxy.config.log2.overspill_report_count
- proxy.config.log2.rolling_enabled
- proxy.config.log2.rolling_interval_sec
- proxy.config.log2.rolling_offset_hr
- proxy.config.log2.rolling_size_mb
- proxy.config.log2.sampling_frequency
- proxy.config.log2.search_log_enabled
- proxy.config.log2.search_log_filters
- proxy.config.log2.search_rolling_interval_sec
- proxy.config.log2.search_server_ip_addr
- proxy.config.log2.search_server_port
- proxy.config.log2.search_top_sites
- proxy.config.log2.search_url_filter
- proxy.config.log2.separate_host_logs
- proxy.config.log2.separate_icp_logs
- proxy.config.log2.space_used_frequency
- proxy.config.log2.squid_log_enabled
- proxy.config.log2.squid_log_header
- proxy.config.log2.squid_log_is_ascii
- proxy.config.log2.squid_log_name
- proxy.config.log2.xml_config_file
- proxy.config.log2.xml_logs_config
+ proxy.config.log.ascii_buffer_size
+ proxy.config.log.auto_delete_rolled_files
+ proxy.config.log.collation_host
+ proxy.config.log.collation_host_tagged
+ proxy.config.log.collation_max_send_buffers
+ proxy.config.log.collation_port
+ proxy.config.log.collation_retry_sec
+ proxy.config.log.collation_secret
+ proxy.config.log.common_log_enabled
+ proxy.config.log.common_log_header
+ proxy.config.log.common_log_is_ascii
+ proxy.config.log.common_log_name
+ proxy.config.log.custom_logs_enabled
+ proxy.config.log.extended2_log_enabled
+ proxy.config.log.extended2_log_header
+ proxy.config.log.extended2_log_is_ascii
+ proxy.config.log.extended2_log_name
+ proxy.config.log.extended_log_enabled
+ proxy.config.log.extended_log_header
+ proxy.config.log.extended_log_is_ascii
+ proxy.config.log.extended_log_name
+ proxy.config.log.file_stat_frequency
+ proxy.config.log.hostname
+ proxy.config.log.hosts_config_file
+ proxy.config.log.log_buffer_size
+ proxy.config.log.logfile_dir
+ proxy.config.log.logfile_perm
+ proxy.config.log.logging_enabled
+ proxy.config.log.max_entries_per_buffer
+ proxy.config.log.max_line_size
+ proxy.config.log.max_secs_per_buffer
+ proxy.config.log.max_space_mb_for_logs
+ proxy.config.log.max_space_mb_for_orphan_logs
+ proxy.config.log.max_space_mb_headroom
+ proxy.config.log.overspill_report_count
+ proxy.config.log.rolling_enabled
+ proxy.config.log.rolling_interval_sec
+ proxy.config.log.rolling_offset_hr
+ proxy.config.log.rolling_size_mb
+ proxy.config.log.sampling_frequency
+ proxy.config.log.search_log_enabled
+ proxy.config.log.search_log_filters
+ proxy.config.log.search_rolling_interval_sec
+ proxy.config.log.search_server_ip_addr
+ proxy.config.log.search_server_port
+ proxy.config.log.search_top_sites
+ proxy.config.log.search_url_filter
+ proxy.config.log.separate_host_logs
+ proxy.config.log.separate_icp_logs
+ proxy.config.log.space_used_frequency
+ proxy.config.log.squid_log_enabled
+ proxy.config.log.squid_log_header
+ proxy.config.log.squid_log_is_ascii
+ proxy.config.log.squid_log_name
+ proxy.config.log.xml_config_file
proxy.config.manager_binary
proxy.config.manager_name
proxy.config.net.accept_throttle
@@ -616,7 +613,6 @@ The Apache Traffic Server Administration
proxy.config.raft.server_port
proxy.config.remap.num_remap_threads
proxy.config.remap.use_remap_processor
- proxy.config.resource.target_maxmem_mb
proxy.config.res_track_memory
proxy.config.reverse_proxy.enabled
proxy.config.reverse_proxy.oldasxbehavior
@@ -672,7 +668,6 @@ The Apache Traffic Server Administration
proxy.config.stat_systemV2.max_stats_allowed
proxy.config.stat_systemV2.num_stats_estimate
proxy.config.syslog_facility
- proxy.config.system.memalign_heap
proxy.config.system.mmap_max
proxy.config.temp_dir
proxy.config.thread.default.stacksize
Modified: trafficserver/traffic/branches/wccp/contrib/set_trafficserver.sh
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/contrib/set_trafficserver.sh?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/contrib/set_trafficserver.sh (original)
+++ trafficserver/traffic/branches/wccp/contrib/set_trafficserver.sh Tue Nov 30 01:42:55 2010
@@ -46,7 +46,7 @@ function recordsConfig() {
traffic_line -s proxy.config.exec_thread.autoconfig.scale -v 1.000000
traffic_line -s proxy.config.accept_threads -v 1
- traffic_line -s proxy.config.log2.logging_enabled -v 0
+ traffic_line -s proxy.config.log.logging_enabled -v 0
traffic_line -s proxy.config.http.server_port -v 8080
traffic_line -s proxy.config.url_remap.pristine_host_hdr -v 1
Propchange: trafficserver/traffic/branches/wccp/example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Modified: trafficserver/traffic/branches/wccp/example/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/example/Makefile.am?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/example/Makefile.am (original)
+++ trafficserver/traffic/branches/wccp/example/Makefile.am Tue Nov 30 01:42:55 2010
@@ -17,6 +17,5 @@
if STANDALONE_IOCORE
SUBDIRS = app-template
else
-# TODO: add 'file_system_cache' example when working.
-SUBDIRS = . add-header append-transform basic-auth blacklist-0 blacklist-1 bnull-transform cache_plugin cache_scan file-1 gzip-transform hello null-transform output-header protocol query_remap redirect-1 remap replace-header response-header-1 server-transform session-1 thread-1 thread-pool
+SUBDIRS = . add-header append-transform basic-auth blacklist-0 blacklist-1 bnull-transform cache_scan file-1 gzip-transform hello null-transform output-header protocol query_remap redirect-1 remap replace-header response-header-1 server-transform session-1 thread-1 thread-pool
endif
Propchange: trafficserver/traffic/branches/wccp/example/add-header/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+.deps
Modified: trafficserver/traffic/branches/wccp/example/add-header/add-header.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/example/add-header/add-header.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/example/add-header/add-header.c (original)
+++ trafficserver/traffic/branches/wccp/example/add-header/add-header.c Tue Nov 30 01:42:55 2010
@@ -38,27 +38,27 @@
#include <string.h>
#include <ts/ts.h>
-static INKMBuffer hdr_bufp;
-static INKMLoc hdr_loc;
+static TSMBuffer hdr_bufp;
+static TSMLoc hdr_loc;
static void
-add_header(INKHttpTxn txnp, INKCont contp)
+add_header(TSHttpTxn txnp, TSCont contp)
{
- INKMBuffer req_bufp;
- INKMLoc req_loc;
- INKMLoc field_loc;
- INKMLoc next_field_loc;
- INKMLoc new_field_loc;
+ TSMBuffer req_bufp;
+ TSMLoc req_loc;
+ TSMLoc field_loc;
+ TSMLoc next_field_loc;
+ TSMLoc new_field_loc;
int retval;
- if (!INKHttpTxnClientReqGet(txnp, &req_bufp, &req_loc)) {
- INKError("[add_header] Error while retrieving client request header\n");
+ if (!TSHttpTxnClientReqGet(txnp, &req_bufp, &req_loc)) {
+ TSError("[add_header] Error while retrieving client request header\n");
goto done;
}
- field_loc = INKMimeHdrFieldGet(hdr_bufp, hdr_loc, 0);
- if (field_loc == INK_ERROR_PTR) {
- INKError("[add_header] Error while getting field");
+ field_loc = TSMimeHdrFieldGet(hdr_bufp, hdr_loc, 0);
+ if (field_loc == TS_ERROR_PTR) {
+ TSError("[add_header] Error while getting field");
goto error;
}
@@ -66,58 +66,58 @@ add_header(INKHttpTxn txnp, INKCont cont
while (field_loc) {
/* First create a new field in the client request header */
- new_field_loc = INKMimeHdrFieldCreate(req_bufp, req_loc);
- if (new_field_loc == INK_ERROR_PTR) {
- INKError("[add_header] Error while creating new field");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ new_field_loc = TSMimeHdrFieldCreate(req_bufp, req_loc);
+ if (new_field_loc == TS_ERROR_PTR) {
+ TSError("[add_header] Error while creating new field");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
break;
}
/* Then copy our new field at this new location */
- retval = INKMimeHdrFieldCopy(req_bufp, req_loc, new_field_loc, hdr_bufp, hdr_loc, field_loc);
- if (retval == INK_ERROR) {
- INKError("[add_header] Error while copying new field");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ retval = TSMimeHdrFieldCopy(req_bufp, req_loc, new_field_loc, hdr_bufp, hdr_loc, field_loc);
+ if (retval == TS_ERROR) {
+ TSError("[add_header] Error while copying new field");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
break;
}
/* Add this field to the Http client request header */
- retval = INKMimeHdrFieldAppend(req_bufp, req_loc, new_field_loc);
- if (retval == INK_ERROR) {
- INKError("[add_header] Error while appending new field");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ retval = TSMimeHdrFieldAppend(req_bufp, req_loc, new_field_loc);
+ if (retval == TS_ERROR) {
+ TSError("[add_header] Error while appending new field");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
break;
}
/* We can now release this handle */
- INKHandleMLocRelease(req_bufp, req_loc, new_field_loc);
+ TSHandleMLocRelease(req_bufp, req_loc, new_field_loc);
- next_field_loc = INKMimeHdrFieldNext(hdr_bufp, hdr_loc, field_loc);
- if (next_field_loc == INK_ERROR_PTR) {
- INKError("[add_header] Error while getting next field to add");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ next_field_loc = TSMimeHdrFieldNext(hdr_bufp, hdr_loc, field_loc);
+ if (next_field_loc == TS_ERROR_PTR) {
+ TSError("[add_header] Error while getting next field to add");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
goto error;
}
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
field_loc = next_field_loc;
}
error:
- INKHandleMLocRelease(req_bufp, INK_NULL_MLOC, req_loc);
+ TSHandleMLocRelease(req_bufp, TS_NULL_MLOC, req_loc);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static int
-add_header_plugin(INKCont contp, INKEvent event, void *edata)
+add_header_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp = (INKHttpTxn) edata;
+ TSHttpTxn txnp = (TSHttpTxn) edata;
switch (event) {
- case INK_EVENT_HTTP_READ_REQUEST_HDR:
+ case TS_EVENT_HTTP_READ_REQUEST_HDR:
add_header(txnp, contp);
return 0;
default:
@@ -130,7 +130,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -152,62 +152,62 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
- INKMLoc field_loc;
+ TSMLoc field_loc;
const char *p;
int i, retval;
- INKPluginRegistrationInfo info;
+ TSPluginRegistrationInfo info;
info.plugin_name = "add-header";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("[PluginInit] Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("[PluginInit] Plugin registration failed.\n");
goto error;
}
if (!check_ts_version()) {
- INKError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
+ TSError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
goto error;
}
if (argc < 2) {
- INKError("[PluginInit] Usage: %s \"name1: value1\" \"name2: value2\" ...>\n", argv[0]);
+ TSError("[PluginInit] Usage: %s \"name1: value1\" \"name2: value2\" ...>\n", argv[0]);
goto error;
}
- hdr_bufp = INKMBufferCreate();
- if (hdr_bufp == INK_ERROR_PTR) {
- INKError("[PluginInit] Can not create mbuffer");
+ hdr_bufp = TSMBufferCreate();
+ if (hdr_bufp == TS_ERROR_PTR) {
+ TSError("[PluginInit] Can not create mbuffer");
goto error;
}
- hdr_loc = INKMimeHdrCreate(hdr_bufp);
- if (hdr_loc == INK_ERROR_PTR) {
- INKError("[PluginInit] Can not create mime header");
+ hdr_loc = TSMimeHdrCreate(hdr_bufp);
+ if (hdr_loc == TS_ERROR_PTR) {
+ TSError("[PluginInit] Can not create mime header");
goto error;
}
for (i = 1; i < argc; i++) {
- field_loc = INKMimeHdrFieldCreate(hdr_bufp, hdr_loc);
- if (field_loc == INK_ERROR_PTR) {
- INKError("[PluginInit] Error while creating field");
+ field_loc = TSMimeHdrFieldCreate(hdr_bufp, hdr_loc);
+ if (field_loc == TS_ERROR_PTR) {
+ TSError("[PluginInit] Error while creating field");
goto error;
}
- retval = INKMimeHdrFieldAppend(hdr_bufp, hdr_loc, field_loc);
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while adding field");
+ retval = TSMimeHdrFieldAppend(hdr_bufp, hdr_loc, field_loc);
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while adding field");
goto error;
}
p = strchr(argv[i], ':');
if (p) {
- retval = INKMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], p - argv[i]);
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while naming field");
+ retval = TSMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], p - argv[i]);
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while naming field");
goto error;
}
@@ -215,15 +215,15 @@ INKPluginInit(int argc, const char *argv
while (isspace(*p)) {
p += 1;
}
- retval = INKMimeHdrFieldValueStringInsert(hdr_bufp, hdr_loc, field_loc, -1, p, strlen(p));
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while inserting field value");
+ retval = TSMimeHdrFieldValueStringInsert(hdr_bufp, hdr_loc, field_loc, -1, p, strlen(p));
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while inserting field value");
goto error;
}
} else {
- retval = INKMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], strlen(argv[i]));
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while inserting field value");
+ retval = TSMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], strlen(argv[i]));
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while inserting field value");
goto error;
}
}
@@ -231,16 +231,16 @@ INKPluginInit(int argc, const char *argv
/* Create a continuation with a mutex as there is a shared global structure
containing the headers to add */
- retval = INKHttpHookAdd(INK_HTTP_READ_REQUEST_HDR_HOOK, INKContCreate(add_header_plugin, INKMutexCreate()));
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while registering to hook");
+ retval = TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, TSContCreate(add_header_plugin, TSMutexCreate()));
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while registering to hook");
goto error;
}
goto done;
error:
- INKError("[PluginInit] Plugin not initialized");
+ TSError("[PluginInit] Plugin not initialized");
done:
return;
Modified: trafficserver/traffic/branches/wccp/example/add-header/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/example/add-header/readme.txt?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/example/add-header/readme.txt (original)
+++ trafficserver/traffic/branches/wccp/example/add-header/readme.txt Tue Nov 30 01:42:55 2010
@@ -9,42 +9,42 @@ enter the following line in plugin.confi
On NT: AddHeader.dll "name1: value1" "name2: value2"
On Solaris: add-header.so "name1: value1" "name2: value2"
-The INKPluginInit function does the following:
+The TSPluginInit function does the following:
- creates a MIME field buffer that contains the header to be added,
using the following functions:
- INKMBufferCreate
- INKMimeHdrCreate
- INKMimeFieldCreate
- INKMimeFieldInsert
- INKMimeFieldNameSet
- INKMimeFieldValueInsert
+ TSMBufferCreate
+ TSMimeHdrCreate
+ TSMimeHdrFieldCreate
+ TSMimeHdrFieldAppend
+ TSMimeHdrFieldNameSet
+ TSMimeHdrFieldValueAppend
- sets up the callback for the add-header-plugin function, which
is the main callback function, using
- INKHttpHookAdd(INK_HTTP_READ_REQUEST_HDR_HOOK,
- INKContCreate(add_header_plugin, NULL);
+ TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK,
+ TSContCreate(add_header_plugin, NULL);
add_header_plugin is the main function in the plugin. In the
-event of INK_EVENT_HTTP_READ_REQUEST_HDR (when the HTTP
+event of TS_EVENT_HTTP_READ_REQUEST_HDR (when the HTTP
state machine reads a request header), it calls the function
add_header.
add_header first makes sure that it can retrieve the client request
header from the current transaction, using
- INKHttpTxnClientReqGet
+ TSHttpTxnClientReqGet
copies the header into the MIME headers of the
HTTP request, using the following functions:
- INKMimeHdrFieldGet
- INKMimeFieldCreate
- INKMimeFieldCopy
- INKMimeHdrFieldInsert
- INKMimeFieldNext
+ TSMimeHdrFieldGet
+ TSMimeHdrFieldCreate
+ TSMimeHdrFieldCopy
+ TSMimeHdrFieldAPpend
+ TSMimeHdrFieldNext
When add_header is done, it uses
- INKHttpTxnReenable
+ TSHttpTxnReenable
to continue.
Propchange: trafficserver/traffic/branches/wccp/example/app-template/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -0,0 +1,4 @@
+records.config
+Makefile.in
+Makefile
+.deps
Modified: trafficserver/traffic/branches/wccp/example/app-template/app-template.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/example/app-template/app-template.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/example/app-template/app-template.cc (original)
+++ trafficserver/traffic/branches/wccp/example/app-template/app-template.cc Tue Nov 30 01:42:55 2010
@@ -46,7 +46,7 @@
#define PROGRAM_NAME "tsapp"
-extern int use_accept_thread; // TODO: rename and move to I_UnixNetProcessor.h
+int use_accept_thread = 0; // TODO: rename and move to I_UnixNetProcessor.h
extern void RecDumpRecordsHt(RecT rec_type); // TODO: move from P_RecCore.h -> I_RecCore.h
int system_num_of_processors = ink_number_of_processors();
Propchange: trafficserver/traffic/branches/wccp/example/append-transform/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+.deps
Modified: trafficserver/traffic/branches/wccp/example/append-transform/append-transform.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/example/append-transform/append-transform.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/example/append-transform/append-transform.c (original)
+++ trafficserver/traffic/branches/wccp/example/append-transform/append-transform.c Tue Nov 30 01:42:55 2010
@@ -42,18 +42,18 @@
#include <string.h>
#include <ts/ts.h>
-#define ASSERT_SUCCESS(_x) INKAssert ((_x) == INK_SUCCESS)
+#define ASSERT_SUCCESS(_x) TSAssert ((_x) == TS_SUCCESS)
typedef struct
{
- INKVIO output_vio;
- INKIOBuffer output_buffer;
- INKIOBufferReader output_reader;
+ TSVIO output_vio;
+ TSIOBuffer output_buffer;
+ TSIOBufferReader output_reader;
int append_needed;
} MyData;
-static INKIOBuffer append_buffer;
-static INKIOBufferReader append_buffer_reader;
+static TSIOBuffer append_buffer;
+static TSIOBufferReader append_buffer_reader;
static int append_buffer_length;
static MyData *
@@ -61,8 +61,8 @@ my_data_alloc()
{
MyData *data;
- data = (MyData *) INKmalloc(sizeof(MyData));
- INKReleaseAssert(data && data != INK_ERROR_PTR);
+ data = (MyData *) TSmalloc(sizeof(MyData));
+ TSReleaseAssert(data && data != TS_ERROR_PTR);
data->output_vio = NULL;
data->output_buffer = NULL;
@@ -77,45 +77,45 @@ my_data_destroy(MyData * data)
{
if (data) {
if (data->output_buffer) {
- ASSERT_SUCCESS(INKIOBufferDestroy(data->output_buffer));
+ ASSERT_SUCCESS(TSIOBufferDestroy(data->output_buffer));
}
- INKfree(data);
+ TSfree(data);
}
}
static void
-handle_transform(INKCont contp)
+handle_transform(TSCont contp)
{
- INKVConn output_conn;
- INKVIO write_vio;
+ TSVConn output_conn;
+ TSVIO write_vio;
MyData *data;
int towrite;
int avail;
/* Get the output connection where we'll write data to. */
- output_conn = INKTransformOutputVConnGet(contp);
+ output_conn = TSTransformOutputVConnGet(contp);
/* Get the write VIO for the write operation that was performed on
ourself. This VIO contains the buffer that we are to read from
as well as the continuation we are to call when the buffer is
empty. */
- write_vio = INKVConnWriteVIOGet(contp);
+ write_vio = TSVConnWriteVIOGet(contp);
/* Get our data structure for this operation. The private data
structure contains the output VIO and output buffer. If the
private data structure pointer is NULL, then we'll create it
and initialize its internals. */
- data = INKContDataGet(contp);
+ data = TSContDataGet(contp);
if (!data) {
- towrite = INKVIONBytesGet(write_vio);
+ towrite = TSVIONBytesGet(write_vio);
if (towrite != INT_MAX) {
towrite += append_buffer_length;
}
data = my_data_alloc();
- data->output_buffer = INKIOBufferCreate();
- data->output_reader = INKIOBufferReaderAlloc(data->output_buffer);
- data->output_vio = INKVConnWrite(output_conn, contp, data->output_reader, towrite);
- ASSERT_SUCCESS(INKContDataSet(contp, data));
+ data->output_buffer = TSIOBufferCreate();
+ data->output_reader = TSIOBufferReaderAlloc(data->output_buffer);
+ data->output_vio = TSVConnWrite(output_conn, contp, data->output_reader, towrite);
+ ASSERT_SUCCESS(TSContDataSet(contp, data));
}
/* We also check to see if the write VIO's buffer is non-NULL. A
@@ -125,62 +125,62 @@ handle_transform(INKCont contp)
transformation that means we're done. In a more complex
transformation we might have to finish writing the transformed
data to our output connection. */
- if (!INKVIOBufferGet(write_vio)) {
+ if (!TSVIOBufferGet(write_vio)) {
if (data->append_needed) {
data->append_needed = 0;
- INKIOBufferCopy(INKVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
+ TSIOBufferCopy(TSVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
}
- ASSERT_SUCCESS(INKVIONBytesSet(data->output_vio, INKVIONDoneGet(write_vio) + append_buffer_length));
+ ASSERT_SUCCESS(TSVIONBytesSet(data->output_vio, TSVIONDoneGet(write_vio) + append_buffer_length));
- ASSERT_SUCCESS(INKVIOReenable(data->output_vio));
+ ASSERT_SUCCESS(TSVIOReenable(data->output_vio));
return;
}
/* Determine how much data we have left to read. For this append
transform plugin this is also the amount of data we have left
to write to the output connection. */
- towrite = INKVIONTodoGet(write_vio);
+ towrite = TSVIONTodoGet(write_vio);
if (towrite > 0) {
/* The amount of data left to read needs to be truncated by
the amount of data actually in the read buffer. */
- avail = INKIOBufferReaderAvail(INKVIOReaderGet(write_vio));
+ avail = TSIOBufferReaderAvail(TSVIOReaderGet(write_vio));
if (towrite > avail) {
towrite = avail;
}
if (towrite > 0) {
/* Copy the data from the read buffer to the output buffer. */
- INKIOBufferCopy(INKVIOBufferGet(data->output_vio), INKVIOReaderGet(write_vio), towrite, 0);
+ TSIOBufferCopy(TSVIOBufferGet(data->output_vio), TSVIOReaderGet(write_vio), towrite, 0);
/* Tell the read buffer that we have read the data and are no
longer interested in it. */
- ASSERT_SUCCESS(INKIOBufferReaderConsume(INKVIOReaderGet(write_vio), towrite));
+ ASSERT_SUCCESS(TSIOBufferReaderConsume(TSVIOReaderGet(write_vio), towrite));
/* Modify the write VIO to reflect how much data we've
completed. */
- ASSERT_SUCCESS(INKVIONDoneSet(write_vio, INKVIONDoneGet(write_vio) + towrite));
+ ASSERT_SUCCESS(TSVIONDoneSet(write_vio, TSVIONDoneGet(write_vio) + towrite));
}
}
/* Now we check the write VIO to see if there is data left to
read. */
- if (INKVIONTodoGet(write_vio) > 0) {
+ if (TSVIONTodoGet(write_vio) > 0) {
if (towrite > 0) {
/* If there is data left to read, then we reenable the output
connection by reenabling the output VIO. This will wakeup
the output connection and allow it to consume data from the
output buffer. */
- ASSERT_SUCCESS(INKVIOReenable(data->output_vio));
+ ASSERT_SUCCESS(TSVIOReenable(data->output_vio));
/* Call back the write VIO continuation to let it know that we
are ready for more data. */
- INKContCall(INKVIOContGet(write_vio), INK_EVENT_VCONN_WRITE_READY, write_vio);
+ TSContCall(TSVIOContGet(write_vio), TS_EVENT_VCONN_WRITE_READY, write_vio);
}
} else {
if (data->append_needed) {
data->append_needed = 0;
- INKIOBufferCopy(INKVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
+ TSIOBufferCopy(TSVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
}
/* If there is no data left to read, then we modify the output
@@ -188,49 +188,49 @@ handle_transform(INKCont contp)
expect. This allows the output connection to know when it
is done reading. We then reenable the output connection so
that it can consume the data we just gave it. */
- ASSERT_SUCCESS(INKVIONBytesSet(data->output_vio, INKVIONDoneGet(write_vio) + append_buffer_length));
+ ASSERT_SUCCESS(TSVIONBytesSet(data->output_vio, TSVIONDoneGet(write_vio) + append_buffer_length));
- ASSERT_SUCCESS(INKVIOReenable(data->output_vio));
+ ASSERT_SUCCESS(TSVIOReenable(data->output_vio));
/* Call back the write VIO continuation to let it know that we
have completed the write operation. */
- INKContCall(INKVIOContGet(write_vio), INK_EVENT_VCONN_WRITE_COMPLETE, write_vio);
+ TSContCall(TSVIOContGet(write_vio), TS_EVENT_VCONN_WRITE_COMPLETE, write_vio);
}
}
static int
-append_transform(INKCont contp, INKEvent event, void *edata)
+append_transform(TSCont contp, TSEvent event, void *edata)
{
/* Check to see if the transformation has been closed by a call to
- INKVConnClose. */
- if (INKVConnClosedGet(contp)) {
- my_data_destroy(INKContDataGet(contp));
- ASSERT_SUCCESS(INKContDestroy(contp));
+ TSVConnClose. */
+ if (TSVConnClosedGet(contp)) {
+ my_data_destroy(TSContDataGet(contp));
+ ASSERT_SUCCESS(TSContDestroy(contp));
return 0;
} else {
switch (event) {
- case INK_EVENT_ERROR:
+ case TS_EVENT_ERROR:
{
- INKVIO write_vio;
+ TSVIO write_vio;
/* Get the write VIO for the write operation that was
performed on ourself. This VIO contains the continuation of
our parent transformation. */
- write_vio = INKVConnWriteVIOGet(contp);
+ write_vio = TSVConnWriteVIOGet(contp);
/* Call back the write VIO continuation to let it know that we
have completed the write operation. */
- INKContCall(INKVIOContGet(write_vio), INK_EVENT_ERROR, write_vio);
+ TSContCall(TSVIOContGet(write_vio), TS_EVENT_ERROR, write_vio);
}
break;
- case INK_EVENT_VCONN_WRITE_COMPLETE:
+ case TS_EVENT_VCONN_WRITE_COMPLETE:
/* When our output connection says that it has finished
reading all the data we've written to it then we should
shutdown the write portion of its connection to
indicate that we don't want to hear about it anymore. */
- ASSERT_SUCCESS(INKVConnShutdown(INKTransformOutputVConnGet(contp), 0, 1));
+ ASSERT_SUCCESS(TSVConnShutdown(TSTransformOutputVConnGet(contp), 0, 1));
break;
- case INK_EVENT_VCONN_WRITE_READY:
+ case TS_EVENT_VCONN_WRITE_READY:
default:
/* If we get a WRITE_READY event or any other type of
event (sent, perhaps, because we were reenabled) then
@@ -244,46 +244,46 @@ append_transform(INKCont contp, INKEvent
}
static int
-transformable(INKHttpTxn txnp)
+transformable(TSHttpTxn txnp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc field_loc;
- INKHttpStatus resp_status;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc field_loc;
+ TSHttpStatus resp_status;
const char *value;
int val_length;
- INKHttpTxnServerRespGet(txnp, &bufp, &hdr_loc);
+ TSHttpTxnServerRespGet(txnp, &bufp, &hdr_loc);
/*
* We are only interested in "200 OK" responses.
*/
- if (INK_HTTP_STATUS_OK == (resp_status = INKHttpHdrStatusGet(bufp, hdr_loc))) {
+ if (TS_HTTP_STATUS_OK == (resp_status = TSHttpHdrStatusGet(bufp, hdr_loc))) {
/* We only want to do the transformation on documents that have a
content type of "text/html". */
- field_loc = INKMimeHdrFieldFind(bufp, hdr_loc, "Content-Type", 12);
+ field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, "Content-Type", 12);
if (!field_loc) {
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc));
return 0;
}
- if (INKMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &value, &val_length) == INK_SUCCESS) {
+ if (TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &value, &val_length) == TS_SUCCESS) {
#ifndef _WIN32
if (value && (strncasecmp(value, "text/html", sizeof("text/html") - 1) == 0)) {
#else
if (value && (strnicmp(value, "text/html", sizeof("text/html") - 1) == 0)) {
#endif
- ASSERT_SUCCESS(INKHandleStringRelease(bufp, field_loc, value));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, hdr_loc, field_loc));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc));
+ ASSERT_SUCCESS(TSHandleStringRelease(bufp, field_loc, value));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, hdr_loc, field_loc));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc));
return 1;
} else {
- ASSERT_SUCCESS(INKHandleStringRelease(bufp, field_loc, value));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, hdr_loc, field_loc));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc));
+ ASSERT_SUCCESS(TSHandleStringRelease(bufp, field_loc, value));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, hdr_loc, field_loc));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc));
return 0;
}
@@ -294,28 +294,28 @@ transformable(INKHttpTxn txnp)
}
static void
-transform_add(INKHttpTxn txnp)
+transform_add(TSHttpTxn txnp)
{
- INKVConn connp;
+ TSVConn connp;
- connp = INKTransformCreate(append_transform, txnp);
+ connp = TSTransformCreate(append_transform, txnp);
- if (INKHttpTxnHookAdd(txnp, INK_HTTP_RESPONSE_TRANSFORM_HOOK, connp) == INK_ERROR) {
- INKError("[append-transform] Unable to attach plugin to http transaction\n");
+ if (TSHttpTxnHookAdd(txnp, TS_HTTP_RESPONSE_TRANSFORM_HOOK, connp) == TS_ERROR) {
+ TSError("[append-transform] Unable to attach plugin to http transaction\n");
}
}
static int
-transform_plugin(INKCont contp, INKEvent event, void *edata)
+transform_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp = (INKHttpTxn) edata;
+ TSHttpTxn txnp = (TSHttpTxn) edata;
switch (event) {
- case INK_EVENT_HTTP_READ_RESPONSE_HDR:
+ case TS_EVENT_HTTP_READ_RESPONSE_HDR:
if (transformable(txnp)) {
transform_add(txnp);
}
- ASSERT_SUCCESS(INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE));
+ ASSERT_SUCCESS(TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE));
return 0;
default:
break;
@@ -327,36 +327,36 @@ transform_plugin(INKCont contp, INKEvent
static int
load(const char *filename)
{
- INKFile fp;
- INKIOBufferBlock blk;
+ TSFile fp;
+ TSIOBufferBlock blk;
char *p;
- int avail;
+ int64 avail;
int err;
- fp = INKfopen(filename, "r");
+ fp = TSfopen(filename, "r");
if (!fp) {
return 0;
}
- append_buffer = INKIOBufferCreate();
- append_buffer_reader = INKIOBufferReaderAlloc(append_buffer);
- INKAssert(append_buffer_reader != INK_ERROR_PTR);
+ append_buffer = TSIOBufferCreate();
+ append_buffer_reader = TSIOBufferReaderAlloc(append_buffer);
+ TSAssert(append_buffer_reader != TS_ERROR_PTR);
for (;;) {
- blk = INKIOBufferStart(append_buffer);
- p = INKIOBufferBlockWriteStart(blk, &avail);
+ blk = TSIOBufferStart(append_buffer);
+ p = TSIOBufferBlockWriteStart(blk, &avail);
- err = INKfread(fp, p, avail);
+ err = TSfread(fp, p, avail);
if (err > 0) {
- ASSERT_SUCCESS(INKIOBufferProduce(append_buffer, err));
+ ASSERT_SUCCESS(TSIOBufferProduce(append_buffer, err));
} else {
break;
}
}
- append_buffer_length = INKIOBufferReaderAvail(append_buffer_reader);
+ append_buffer_length = TSIOBufferReaderAvail(append_buffer_reader);
- INKfclose(fp);
+ TSfclose(fp);
return 1;
}
@@ -364,7 +364,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -387,36 +387,36 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
- INKPluginRegistrationInfo info;
+ TSPluginRegistrationInfo info;
info.plugin_name = "append-transform";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("Plugin registration failed.\n");
goto Lerror;
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 2.0 or later\n");
+ TSError("Plugin requires Traffic Server 2.0 or later\n");
goto Lerror;
}
if (argc != 2) {
- INKError("usage: %s <filename>\n", argv[0]);
+ TSError("usage: %s <filename>\n", argv[0]);
goto Lerror;
}
if (!load(argv[1])) {
- INKError("[append-transform] Could not load %s\n", argv[1]);
+ TSError("[append-transform] Could not load %s\n", argv[1]);
goto Lerror;
}
- if (INKHttpHookAdd(INK_HTTP_READ_RESPONSE_HDR_HOOK, INKContCreate(transform_plugin, NULL)) == INK_ERROR) {
- INKError("[append-transform] Unable to set read response header\n");
+ if (TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, TSContCreate(transform_plugin, NULL)) == TS_ERROR) {
+ TSError("[append-transform] Unable to set read response header\n");
goto Lerror;
}
@@ -424,5 +424,5 @@ INKPluginInit(int argc, const char *argv
Lerror:
- INKError("[append-transform] Unable to initialize plugin\n");
+ TSError("[append-transform] Unable to initialize plugin\n");
}