trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r911702 [1/3] - in /incubator/trafficserver/traffic/branches/dev: ./ doc/ example/ example/add-header/ example/append-transform/ example/basic-auth/ example/blacklist-0/ example/blacklist-1/ example/bnull-transform/ example/cache_plugin/ ex...
Date Fri, 19 Feb 2010 05:37:33 GMT
Author: georgep
Date: Fri Feb 19 05:37:28 2010
New Revision: 911702

URL: http://svn.apache.org/viewvc?rev=911702&view=rev
Log:
Merge changes from TS-9, TS-195, TS-194, TS-189, TS-106, TS-184, TS-129, TS-98, TS-191, TS-190, TS-185 from trunk to dev branch.

Added:
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/remap.h
      - copied unchanged from r911700, incubator/trafficserver/traffic/trunk/proxy/api/include/remap.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/ts.h
      - copied unchanged from r911700, incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/ts_private.h
      - copied unchanged from r911700, incubator/trafficserver/traffic/trunk/proxy/api/include/ts_private.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/ts_private_frozen.h
      - copied unchanged from r911700, incubator/trafficserver/traffic/trunk/proxy/api/include/ts_private_frozen.h
Removed:
    incubator/trafficserver/traffic/branches/dev/proxy/RemapAPI.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPI.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivate.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateFrozen.h
Modified:
    incubator/trafficserver/traffic/branches/dev/   (props changed)
    incubator/trafficserver/traffic/branches/dev/doc/   (props changed)
    incubator/trafficserver/traffic/branches/dev/example/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/add-header/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/add-header/add-header.c
    incubator/trafficserver/traffic/branches/dev/example/append-transform/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/append-transform/append-transform.c
    incubator/trafficserver/traffic/branches/dev/example/basic-auth/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/basic-auth/basic-auth.c
    incubator/trafficserver/traffic/branches/dev/example/blacklist-0/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/blacklist-0/blacklist-0.c
    incubator/trafficserver/traffic/branches/dev/example/blacklist-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist-1.c
    incubator/trafficserver/traffic/branches/dev/example/bnull-transform/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/bnull-transform/bnull-transform.c
    incubator/trafficserver/traffic/branches/dev/example/cache_plugin/cache_plugin.cc
    incubator/trafficserver/traffic/branches/dev/example/cache_scan/cache_scan.cc
    incubator/trafficserver/traffic/branches/dev/example/file-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/file-1/file-1.c
    incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.cc
    incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.h
    incubator/trafficserver/traffic/branches/dev/example/file_system_cache/diskcache_plugin.cc
    incubator/trafficserver/traffic/branches/dev/example/gzip-transform/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gunzip.c
    incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gzip.c
    incubator/trafficserver/traffic/branches/dev/example/hello/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/hello/hello.c
    incubator/trafficserver/traffic/branches/dev/example/null-transform/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/null-transform/null-transform.c
    incubator/trafficserver/traffic/branches/dev/example/output-header/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/output-header/output-header.c
    incubator/trafficserver/traffic/branches/dev/example/prefetch/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/prefetch/prefetch-plugin-eg1.c
    incubator/trafficserver/traffic/branches/dev/example/prefetch/test-hns-plugin.c
    incubator/trafficserver/traffic/branches/dev/example/protocol/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/protocol/Protocol.h
    incubator/trafficserver/traffic/branches/dev/example/redirect-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/redirect-1/redirect-1.c
    incubator/trafficserver/traffic/branches/dev/example/remap/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/remap/remap.cc
    incubator/trafficserver/traffic/branches/dev/example/replace-header/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/replace-header/replace-header.c
    incubator/trafficserver/traffic/branches/dev/example/response-header-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/response-header-1/response-header-1.c
    incubator/trafficserver/traffic/branches/dev/example/server-transform/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/server-transform/server-transform.c
    incubator/trafficserver/traffic/branches/dev/example/session-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/session-1/session-1.c
    incubator/trafficserver/traffic/branches/dev/example/thread-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/thread-1/thread-1.c
    incubator/trafficserver/traffic/branches/dev/example/thread-pool/Makefile.am
    incubator/trafficserver/traffic/branches/dev/example/thread-pool/psi.c
    incubator/trafficserver/traffic/branches/dev/example/thread-pool/thread.c
    incubator/trafficserver/traffic/branches/dev/install/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/aio/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/cache/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/cache/CacheTest.cc
    incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.h
    incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h
    incubator/trafficserver/traffic/branches/dev/iocore/cluster/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_ClusterCache.h
    incubator/trafficserver/traffic/branches/dev/iocore/dns/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/net/   (props changed)
    incubator/trafficserver/traffic/branches/dev/iocore/utils/   (props changed)
    incubator/trafficserver/traffic/branches/dev/libinktomi++/   (props changed)
    incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc
    incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc
    incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h
    incubator/trafficserver/traffic/branches/dev/librecords/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h
    incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc
    incubator/trafficserver/traffic/branches/dev/proxy/InkAPITestTool.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
    incubator/trafficserver/traffic/branches/dev/proxy/Plugin.h
    incubator/trafficserver/traffic/branches/dev/proxy/Prefetch.h
    incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc
    incubator/trafficserver/traffic/branches/dev/proxy/UDPAPIClientTest.h
    incubator/trafficserver/traffic/branches/dev/proxy/UDPAPITest.h
    incubator/trafficserver/traffic/branches/dev/proxy/UserNameCacheTest.cc
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateIOCore.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIaaa.h
    incubator/trafficserver/traffic/branches/dev/proxy/config/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/congest/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/hdrs/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HTTP.h
    incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.cc
    incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTunnel.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPluginInfo.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.h
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.h
    incubator/trafficserver/traffic/branches/dev/proxy/logging/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/logging/Log.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/charting/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/configure/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/configure/helper/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/images/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/include/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/monitor/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/mrtg/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/tune/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/stats/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/   (props changed)
    incubator/trafficserver/traffic/branches/dev/proxy/stats/   (props changed)
    incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/CacheAPITester.h
    incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/INKAction.cc
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKContLeak/wapnet.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/INKContSchedule.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/mod.Sched
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/INKFopen.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpHook.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKProto.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKNetConnectTest.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKqa8418.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/add-header.deprecated.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/alt-info.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/append-transform.deprecated.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/assembly.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/headers.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/headers.h
    incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/list.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/basic-auth-deprecated/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/basic-auth-deprecated/basic-auth.deprecated.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/blacklist-1-neg/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/blacklist-1-neg/blacklist-1-neg.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-constants/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-constants/check-constants.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-http/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-http/check-http-0.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-mime-1/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-mime-1/check-mime-1.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-mime/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-mime/check-mime-0.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-mime/check-mime.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-url/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/check-url/check-url-0.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/climate/climate.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/cluster-RPC/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/cluster-RPC/clusterRPC.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/lookup/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/lookup/lookup.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/order/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/order/orderplugin1.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/order/orderplugin2.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/order/orderplugin3.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/order/orderplugin4.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/order/orderstartplugin.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/plugin_as_origin/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/plugin_as_origin/http_connect_bridge.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/plugin_as_origin/net_bridge.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/plugin_as_origin/serve_file.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/plugin_as_origin/test_dealloc.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/redirect-1-deprecated/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/redirect-1-deprecated/redirect-1.deprecated.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/redirect-1-neg/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/redirect-1-neg/redirect-1-neg.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/session-2/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/session-2/session-2.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/test-mgmt/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/test-mgmt/test-mgmt.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/test-protocol/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/test-protocol/test-protocol.h
    incubator/trafficserver/traffic/branches/dev/test/plugin/test-transform/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/test-transform/test-transform.c
    incubator/trafficserver/traffic/branches/dev/test/plugin/write-server-ip/Makefile.am
    incubator/trafficserver/traffic/branches/dev/test/plugin/write-server-ip/write-server-ip.c

Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -4,3 +4,7 @@
 configure
 Makefile.in
 tags
+config.log
+config.status
+libtool
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 19 05:37:28 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:891822-910781
+/incubator/trafficserver/traffic/trunk:891822-911700

Propchange: incubator/trafficserver/traffic/branches/dev/doc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,3 @@
 Makefile.in
+Makefile
+Doxyfile

Modified: incubator/trafficserver/traffic/branches/dev/example/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/Makefile.am Fri Feb 19 05:37:28 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-API_HDR = ../include/InkAPI.h
+API_HDR = ../proxy/api/include/ts.h
 
 default: \
 	add-header/add-header.so \

Modified: incubator/trafficserver/traffic/branches/dev/example/add-header/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/add-header/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/add-header/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/add-header/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: add-header.so
 
-add-header.o: add-header.c $(API_INC)/InkAPI.h
+add-header.o: add-header.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o add-header.o -c add-header.c
 
 add-header.so: add-header.o

Modified: incubator/trafficserver/traffic/branches/dev/example/add-header/add-header.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/add-header/add-header.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/add-header/add-header.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/add-header/add-header.c Fri Feb 19 05:37:28 2010
@@ -34,7 +34,7 @@
  */
 
 #include <string.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static INKMBuffer hdr_bufp;
 static INKMLoc hdr_loc;

Modified: incubator/trafficserver/traffic/branches/dev/example/append-transform/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/append-transform/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/append-transform/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/append-transform/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: append-transform.so
 
-append-transform.o: append-transform.c $(API_INC)/InkAPI.h
+append-transform.o: append-transform.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o append-transform.o -c append-transform.c
 
 append-transform.so: append-transform.o

Modified: incubator/trafficserver/traffic/branches/dev/example/append-transform/append-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/append-transform/append-transform.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/append-transform/append-transform.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/append-transform/append-transform.c Fri Feb 19 05:37:28 2010
@@ -40,7 +40,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define ASSERT_SUCCESS(_x) INKAssert ((_x) == INK_SUCCESS)
 

Modified: incubator/trafficserver/traffic/branches/dev/example/basic-auth/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/basic-auth/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/basic-auth/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/basic-auth/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: basic-auth.so
 
-basic-auth.o: basic-auth.c $(API_INC)/InkAPI.h
+basic-auth.o: basic-auth.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o basic-auth.o -c basic-auth.c
 
 basic-auth.so: basic-auth.o

Modified: incubator/trafficserver/traffic/branches/dev/example/basic-auth/basic-auth.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/basic-auth/basic-auth.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/basic-auth/basic-auth.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/basic-auth/basic-auth.c Fri Feb 19 05:37:28 2010
@@ -41,7 +41,7 @@
 #include <windows.h>
 #endif
 
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 
 static char base64_codes[256];

Modified: incubator/trafficserver/traffic/branches/dev/example/blacklist-0/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/blacklist-0/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/blacklist-0/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/blacklist-0/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: blacklist-0.so
 
-blacklist-0.o: blacklist-0.c $(API_INC)/InkAPI.h
+blacklist-0.o: blacklist-0.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o blacklist-0.o -c blacklist-0.c
 
 blacklist-0.so: blacklist-0.o

Modified: incubator/trafficserver/traffic/branches/dev/example/blacklist-0/blacklist-0.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/blacklist-0/blacklist-0.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/blacklist-0/blacklist-0.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/blacklist-0/blacklist-0.c Fri Feb 19 05:37:28 2010
@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static char **sites;
 static int nsites;

Modified: incubator/trafficserver/traffic/branches/dev/example/blacklist-1/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/blacklist-1/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/blacklist-1/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/blacklist-1/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: blacklist-1.so
 
-blacklist-1.o: blacklist-1.c $(API_INC)/InkAPI.h
+blacklist-1.o: blacklist-1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o blacklist-1.o -c blacklist-1.c
 
 blacklist-1.so: blacklist-1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist-1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist-1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist-1.c Fri Feb 19 05:37:28 2010
@@ -37,7 +37,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define MAX_NSITES 500
 #define RETRY_TIME 10

Modified: incubator/trafficserver/traffic/branches/dev/example/bnull-transform/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/bnull-transform/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/bnull-transform/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/bnull-transform/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: bnull-transform.so
 
-bnull-transform.o: bnull-transform.c $(API_INC)/InkAPI.h
+bnull-transform.o: bnull-transform.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o bnull-transform.o -c bnull-transform.c
 
 bnull-transform.so: bnull-transform.o

Modified: incubator/trafficserver/traffic/branches/dev/example/bnull-transform/bnull-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/bnull-transform/bnull-transform.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/bnull-transform/bnull-transform.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/bnull-transform/bnull-transform.c Fri Feb 19 05:37:28 2010
@@ -36,7 +36,7 @@
 /* set tab stops to four. */
 
 #include <stdio.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define INK_NULL_MUTEX      NULL
 #define STATE_BUFFER_DATA   0

Modified: incubator/trafficserver/traffic/branches/dev/example/cache_plugin/cache_plugin.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/cache_plugin/cache_plugin.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/cache_plugin/cache_plugin.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/example/cache_plugin/cache_plugin.cc Fri Feb 19 05:37:28 2010
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "InkAPI.h"
+#include <ts/ts.h>
 #include <iostream>
 #include <map>
 #include <string>

Modified: incubator/trafficserver/traffic/branches/dev/example/cache_scan/cache_scan.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/cache_scan/cache_scan.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/cache_scan/cache_scan.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/example/cache_scan/cache_scan.cc Fri Feb 19 05:37:28 2010
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static INKCont global_contp;
 

Modified: incubator/trafficserver/traffic/branches/dev/example/file-1/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/file-1/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/file-1/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/file-1/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: file-1.so
 
-file-1.o: file-1.c $(API_INC)/InkAPI.h
+file-1.o: file-1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o file-1.o -c file-1.c
 
 file-1.so: file-1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/file-1/file-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/file-1/file-1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/file-1/file-1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/file-1/file-1.c Fri Feb 19 05:37:28 2010
@@ -35,7 +35,7 @@
  */
 
 #include <stdio.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 int
 check_ts_version()

Modified: incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.cc Fri Feb 19 05:37:28 2010
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <sys/file.h>
 #include <aio.h>
-#include <InkAPI.h>
+#include <ts/ts.h>
 #include <string.h>
 
 

Modified: incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/example/file_system_cache/DiskCache.h Fri Feb 19 05:37:28 2010
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <InkAPI.h>
+#include <ts/ts.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include <openssl/md5.h>

Modified: incubator/trafficserver/traffic/branches/dev/example/file_system_cache/diskcache_plugin.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/file_system_cache/diskcache_plugin.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/file_system_cache/diskcache_plugin.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/example/file_system_cache/diskcache_plugin.cc Fri Feb 19 05:37:28 2010
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <InkAPI.h>
+#include <ts/ts.h>
 #include <iostream>
 #include "DiskCache.h"
 

Modified: incubator/trafficserver/traffic/branches/dev/example/gzip-transform/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/gzip-transform/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/gzip-transform/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/gzip-transform/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,14 +18,14 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@ -lz
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: gzip.so gunzip.so
 
-gzip.o: gzip.c $(API_INC)/InkAPI.h
+gzip.o: gzip.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -I/usr/local/include -o gzip.o -c gzip.c
 
-gunzip.o: gunzip.c $(API_INC)/InkAPI.h
+gunzip.o: gunzip.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -I/usr/local/include -o gunzip.o -c gunzip.c
 
 gzip.so: gzip.o

Modified: incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gunzip.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gunzip.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gunzip.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gunzip.c Fri Feb 19 05:37:28 2010
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <assert.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define DICT_PATH_MAX 512
 #define DICT_ENTRY_MAX 2048

Modified: incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gzip.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gzip.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gzip.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/gzip-transform/gzip.c Fri Feb 19 05:37:28 2010
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <assert.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define DICT_PATH_MAX 512
 #define DICT_ENTRY_MAX 2048

Modified: incubator/trafficserver/traffic/branches/dev/example/hello/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/hello/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/hello/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/hello/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: hello.so
 
-hello.o: hello.c $(API_INC)/InkAPI.h
+hello.o: hello.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o hello.o -c hello.c
 
 hello.so: hello.o

Modified: incubator/trafficserver/traffic/branches/dev/example/hello/hello.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/hello/hello.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/hello/hello.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/hello/hello.c Fri Feb 19 05:37:28 2010
@@ -33,7 +33,7 @@
  */
 
 #include <stdio.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 int
 check_ts_version()

Modified: incubator/trafficserver/traffic/branches/dev/example/null-transform/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/null-transform/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/null-transform/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/null-transform/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: null-transform.so
 
-null-transform.o: null-transform.c $(API_INC)/InkAPI.h
+null-transform.o: null-transform.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o null-transform.o -c null-transform.c
 
 null-transform.so: null-transform.o

Modified: incubator/trafficserver/traffic/branches/dev/example/null-transform/null-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/null-transform/null-transform.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/null-transform/null-transform.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/null-transform/null-transform.c Fri Feb 19 05:37:28 2010
@@ -34,7 +34,7 @@
  */
 
 #include <stdio.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 typedef struct
 {

Modified: incubator/trafficserver/traffic/branches/dev/example/output-header/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/output-header/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/output-header/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/output-header/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: output-header.so
 
-output-header.o: output-header.c $(API_INC)/InkAPI.h
+output-header.o: output-header.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o output-header.o -c output-header.c
 
 output-header.so: output-header.o

Modified: incubator/trafficserver/traffic/branches/dev/example/output-header/output-header.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/output-header/output-header.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/output-header/output-header.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/output-header/output-header.c Fri Feb 19 05:37:28 2010
@@ -43,7 +43,7 @@
 #include <windows.h>
 #endif
 
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define DEBUG_TAG "output-header"
 

Modified: incubator/trafficserver/traffic/branches/dev/example/prefetch/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/prefetch/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/prefetch/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/prefetch/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=@ld@
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: prefetch-plugin-eg1.so
 
-prefetch-plugin-eg1.o: prefetch-plugin-eg1.c $(API_INC)/InkAPI.h
+prefetch-plugin-eg1.o: prefetch-plugin-eg1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o prefetch-plugin-eg1.o -c prefetch-plugin-eg1.c
 
 prefetch-plugin-eg1.so: prefetch-plugin-eg1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/prefetch/prefetch-plugin-eg1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/prefetch/prefetch-plugin-eg1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/prefetch/prefetch-plugin-eg1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/prefetch/prefetch-plugin-eg1.c Fri Feb 19 05:37:28 2010
@@ -29,8 +29,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
-#include "InkAPIPrivate.h"
+#include <ts/ts.h>
+#include <ts/ts_private.h>
 
 /* We will register the following two hooks */
 

Modified: incubator/trafficserver/traffic/branches/dev/example/prefetch/test-hns-plugin.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/prefetch/test-hns-plugin.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/prefetch/test-hns-plugin.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/prefetch/test-hns-plugin.c Fri Feb 19 05:37:28 2010
@@ -60,8 +60,8 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "InkAPI.h"
-#include "InkAPIPrivate.h"
+#include <ts/ts.h>
+#include <ts/ts_private.h>
 
 /* We will register the following two hooks */
 

Modified: incubator/trafficserver/traffic/branches/dev/example/protocol/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/protocol/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/protocol/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/protocol/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,14 +18,14 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: protocol.so
 
-TxnSM.o: TxnSM.c TxnSM.h $(API_INC)/InkAPI.h
+TxnSM.o: TxnSM.c TxnSM.h $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o TxnSM.o -c TxnSM.c
 
-Protocol.o: Protocol.c $(API_INC)/InkAPI.h
+Protocol.o: Protocol.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o Protocol.o -c Protocol.c
 
 protocol.so: Protocol.o TxnSM.o

Modified: incubator/trafficserver/traffic/branches/dev/example/protocol/Protocol.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/protocol/Protocol.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/protocol/Protocol.h (original)
+++ incubator/trafficserver/traffic/branches/dev/example/protocol/Protocol.h Fri Feb 19 05:37:28 2010
@@ -33,7 +33,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define MAX_SERVER_NAME_LENGTH 1024
 #define MAX_FILE_NAME_LENGTH 1024

Modified: incubator/trafficserver/traffic/branches/dev/example/redirect-1/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/redirect-1/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/redirect-1/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/redirect-1/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: redirect-1.so
 
-redirect-1.o: redirect-1.c $(API_INC)/InkAPI.h
+redirect-1.o: redirect-1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o redirect-1.o -c redirect-1.c
 
 redirect-1.so: redirect-1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/redirect-1/redirect-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/redirect-1/redirect-1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/redirect-1/redirect-1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/redirect-1/redirect-1.c Fri Feb 19 05:37:28 2010
@@ -43,7 +43,7 @@
 #  include <windows.h>
 #endif
 
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #if !defined (_WIN32)
 static in_addr_t ip_deny;

Modified: incubator/trafficserver/traffic/branches/dev/example/remap/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/remap/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/remap/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/remap/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,13 +18,12 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
-REMAP_API_INC=../../..
+API_INC=../../proxy/api/include
 
 default: remap.so
 
-remap.o: replace-header.c $(API_INC)/InkAPI.h
-	$(CC) $(CFLAGS) -I$(REMAP_API_INC) -I$(API_INC) -o remap.o -c remap.c
+remap.o: replace-header.c $(API_INC)/ts.h
+	$(CC) $(CFLAGS) -I$(API_INC) -o remap.o -c remap.c
 
 remap.so: remap.o
 	$(CC) $(LDFLAGS) -o remap.so remap.o

Modified: incubator/trafficserver/traffic/branches/dev/example/remap/remap.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/remap/remap.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/remap/remap.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/example/remap/remap.cc Fri Feb 19 05:37:28 2010
@@ -42,8 +42,8 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#include "RemapAPI.h"
-#include "InkAPI.h"
+#include <ts/remap.h>
+#include <ts/ts.h>
 
 #if __GNUC__ >= 3
 #ifndef likely

Modified: incubator/trafficserver/traffic/branches/dev/example/replace-header/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/replace-header/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/replace-header/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/replace-header/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: replace-header.so
 
-replace-header.o: replace-header.c $(API_INC)/InkAPI.h
+replace-header.o: replace-header.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o replace-header.o -c replace-header.c
 
 replace-header.so: replace-header.o

Modified: incubator/trafficserver/traffic/branches/dev/example/replace-header/replace-header.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/replace-header/replace-header.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/replace-header/replace-header.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/replace-header/replace-header.c Fri Feb 19 05:37:28 2010
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static void
 replace_header(INKHttpTxn txnp, INKCont contp)

Modified: incubator/trafficserver/traffic/branches/dev/example/response-header-1/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/response-header-1/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/response-header-1/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/response-header-1/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: response-header-1.so
 
-response-header-1.o: response-header-1.c $(API_INC)/InkAPI.h
+response-header-1.o: response-header-1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o response-header-1.o -c response-header-1.c
 
 response-header-1.so: response-header-1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/response-header-1/response-header-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/response-header-1/response-header-1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/response-header-1/response-header-1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/response-header-1/response-header-1.c Fri Feb 19 05:37:28 2010
@@ -50,7 +50,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static int init_buffer_status;
 

Modified: incubator/trafficserver/traffic/branches/dev/example/server-transform/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/server-transform/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/server-transform/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/server-transform/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: server-transform.so
 
-server-transform.o: server-transform.c $(API_INC)/InkAPI.h
+server-transform.o: server-transform.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o server-transform.o -c server-transform.c
 
 server-transform.so: server-transform.o

Modified: incubator/trafficserver/traffic/branches/dev/example/server-transform/server-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/server-transform/server-transform.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/server-transform/server-transform.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/server-transform/server-transform.c Fri Feb 19 05:37:28 2010
@@ -60,7 +60,7 @@
 #  include <windows.h>
 #endif
 
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #define STATE_BUFFER       1
 #define STATE_CONNECT      2

Modified: incubator/trafficserver/traffic/branches/dev/example/session-1/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/session-1/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/session-1/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/session-1/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: session-1.so
 
-session-1.o: session-1.c $(API_INC)/InkAPI.h
+session-1.o: session-1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o session-1.o -c session-1.c
 
 session-1.so: session-1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/session-1/session-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/session-1/session-1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/session-1/session-1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/session-1/session-1.c Fri Feb 19 05:37:28 2010
@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static INKStat transaction_count;
 static INKStat session_count;

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-1/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-1/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-1/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-1/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: thread-1.so
 
-thread-1.o: thread-1.c $(API_INC)/InkAPI.h
+thread-1.o: thread-1.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o thread-1.o -c thread-1.c
 
 thread-1.so: thread-1.o

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-1/thread-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-1/thread-1.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-1/thread-1.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-1/thread-1.c Fri Feb 19 05:37:28 2010
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 static void *
 reenable_txn(void *data)

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-pool/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-pool/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-pool/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-pool/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,14 +18,14 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../include
+API_INC=../../proxy/api/include
 
 default: psi.so
 
-thread.o: thread.c thread.h $(API_INC)/InkAPI.h
+thread.o: thread.c thread.h $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o thread.o -c thread.c
 
-psi.o: psi.c $(API_INC)/InkAPI.h
+psi.o: psi.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o psi.o -c psi.c
 
 psi.so: psi.o thread.o

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-pool/psi.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-pool/psi.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-pool/psi.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-pool/psi.c Fri Feb 19 05:37:28 2010
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #include "thread.h"
 

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-pool/thread.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-pool/thread.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-pool/thread.c (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-pool/thread.c Fri Feb 19 05:37:28 2010
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include "InkAPI.h"
+#include <ts/ts.h>
 
 #include "thread.h"
 

Propchange: incubator/trafficserver/traffic/branches/dev/install/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,6 @@
 Makefile.in
+Makefile
+update_records
+trafficserver
+.libs
+.deps

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,2 @@
 Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/aio/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinkaio.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/cache/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinkcache.a
+.deps
+

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/CacheTest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/CacheTest.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/CacheTest.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/CacheTest.cc Fri Feb 19 05:37:28 2010
@@ -24,7 +24,7 @@
 
 #include "P_Cache.h"
 #include "P_CacheTest.h"
-#include "api/include/InkAPI.h"
+#include "api/include/ts.h"
 
 
 void verify_cache_api() {

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.h Fri Feb 19 05:37:28 2010
@@ -25,7 +25,7 @@
 #define __NEWCACHEVC_H__
 
 #include "inktomi++.h"
-#include "api/include/InkAPI.h"
+#include "api/include/ts.h"
 #include "HTTP.h"
 #include "I_Cache.h"
 #include "P_Cache.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h Fri Feb 19 05:37:28 2010
@@ -31,7 +31,7 @@
 #endif
 
 #include "inktomi++.h"
-#include "api/include/InkAPI.h"
+#include "api/include/ts.h"
 
 class EvacuationBlock;
 

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/cluster/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinkcluster.a
+.deps
+

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_ClusterCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_ClusterCache.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_ClusterCache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_ClusterCache.h Fri Feb 19 05:37:28 2010
@@ -963,7 +963,7 @@
  *									    *
  ****************************************************************************
  * Note: All of the following must be kept in sync with INKClusterRPCKey_t  *
- * 	 definition in InkAPIPrivate.h					    *
+ * 	 definition in ts/ts_private.h					    *
  ****************************************************************************/
 
 /************************************************

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/dns/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinkdns.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinkevent.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinkhostdb.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/net/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libinknet.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/iocore/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,4 @@
 Makefile.in
+Makefile
+libinkutils.a
+.deps

Propchange: incubator/trafficserver/traffic/branches/dev/libinktomi++/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,10 @@
 Makefile.in
+Makefile
+ParseRulesCTypeToLower
+mkdfa
+ParseRulesCTypeToUpper
+ParseRulesCType
+CompileParseRules
+libinktomi++.a
+.deps
+.libs

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_res_init.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc Fri Feb 19 05:37:28 2010
@@ -147,7 +147,7 @@
   if (statp->_vcsock >= 0) { 
     (void) close(statp->_vcsock);
     statp->_vcsock = -1;
-    statp->_flags &= ~(RES_F_VC | RES_F_CONN);
+    statp->_flags &= ~(INK_RES_F_VC | INK_RES_F_CONN);
   }
   for (ns = 0; ns < statp->_u._ext.nscount; ns++) {
     if (statp->_u._ext.nssocks[ns] != -1) {
@@ -162,7 +162,7 @@
   ink_res_nclose(statp);
   if (statp->_u._ext.ext != NULL)
     free(statp->_u._ext.ext);
-  statp->options &= ~RES_INIT;
+  statp->options &= ~INK_RES_INIT;
   statp->_u._ext.ext = NULL;
 }
 
@@ -178,7 +178,7 @@
   statp->_u._ext.nscount = 0;
 
   nserv = 0;
-  for (i = 0; i < cnt && nserv < MAXNS; i++) {
+  for (i = 0; i < cnt && nserv < INK_MAXNS; i++) {
     switch (set->sin.sin_family) {
       case AF_INET:
         size = sizeof(set->sin);
@@ -271,7 +271,7 @@
   struct __ink_res_state_ext *ext = statp->_u._ext.ext;
 
 #ifdef DEBUG
-  if (statp->options & RES_DEBUG)
+  if (statp->options & INK_RES_DEBUG)
     printf(";; res_setoptions(\"%s\", \"%s\")...\n",
            options, source);
 #endif
@@ -282,22 +282,22 @@
     /* search for and process individual options */
     if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
       i = atoi(cp + sizeof("ndots:") - 1);
-      if (i <= RES_MAXNDOTS)
+      if (i <= INK_RES_MAXNDOTS)
         statp->ndots = i;
       else
-        statp->ndots = RES_MAXNDOTS;
+        statp->ndots = INK_RES_MAXNDOTS;
 #ifdef DEBUG
-      if (statp->options & RES_DEBUG)
+      if (statp->options & INK_RES_DEBUG)
         printf(";;\tndots=%d\n", statp->ndots);
 #endif
     } else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
       i = atoi(cp + sizeof("timeout:") - 1);
-      if (i <= RES_MAXRETRANS)
+      if (i <= INK_RES_MAXRETRANS)
         statp->retrans = i;
       else
-        statp->retrans = RES_MAXRETRANS;
+        statp->retrans = INK_RES_MAXRETRANS;
 #ifdef DEBUG
-      if (statp->options & RES_DEBUG)
+      if (statp->options & INK_RES_DEBUG)
         printf(";;\ttimeout=%d\n", statp->retrans);
 #endif
 #ifdef	SOLARIS2
@@ -318,20 +318,20 @@
 #endif	/* SOLARIS2 */
     } else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){
       i = atoi(cp + sizeof("attempts:") - 1);
-      if (i <= RES_MAXRETRY)
+      if (i <= INK_RES_MAXRETRY)
         statp->retry = i;
       else
-        statp->retry = RES_MAXRETRY;
+        statp->retry = INK_RES_MAXRETRY;
 #ifdef DEBUG
-      if (statp->options & RES_DEBUG)
+      if (statp->options & INK_RES_DEBUG)
         printf(";;\tattempts=%d\n", statp->retry);
 #endif
     } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
 #ifdef DEBUG
-      if (!(statp->options & RES_DEBUG)) {
+      if (!(statp->options & INK_RES_DEBUG)) {
         printf(";; res_setoptions(\"%s\", \"%s\")..\n",
                options, source);
-        statp->options |= RES_DEBUG;
+        statp->options |= INK_RES_DEBUG;
       }
       printf(";;\tdebug\n");
 #endif
@@ -339,22 +339,22 @@
                         sizeof("no_tld_query") - 1) ||
                !strncmp(cp, "no-tld-query",
                         sizeof("no-tld-query") - 1)) {
-      statp->options |= RES_NOTLDQUERY;
+      statp->options |= INK_RES_NOTLDQUERY;
     } else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-      statp->options |= RES_USE_INET6;
+      statp->options |= INK_RES_USE_INET6;
     } else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
-      statp->options |= RES_ROTATE;
+      statp->options |= INK_RES_ROTATE;
     } else if (!strncmp(cp, "no-check-names",
                         sizeof("no-check-names") - 1)) {
-      statp->options |= RES_NOCHECKNAME;
+      statp->options |= INK_RES_NOCHECKNAME;
     }
-#ifdef RES_USE_EDNS0
+#ifdef INK_RES_USE_EDNS0
     else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
-      statp->options |= RES_USE_EDNS0;
+      statp->options |= INK_RES_USE_EDNS0;
     }
 #endif
     else if (!strncmp(cp, "dname", sizeof("dname") - 1)) {
-      statp->options |= RES_USE_DNAME;
+      statp->options |= INK_RES_USE_DNAME;
     }
     else if (!strncmp(cp, "nibble:", sizeof("nibble:") - 1)) {
       if (ext == NULL)
@@ -376,10 +376,10 @@
       cp += sizeof("v6revmode:") - 1;
       /* "nibble" and "bitstring" used to be valid */
       if (!strncmp(cp, "single", sizeof("single") - 1)) {
-        statp->options |= RES_NO_NIBBLE2;
+        statp->options |= INK_RES_NO_NIBBLE2;
       } else if (!strncmp(cp, "both", sizeof("both") - 1)) {
         statp->options &=
-          ~RES_NO_NIBBLE2;
+          ~INK_RES_NO_NIBBLE2;
       }
     }
     else {
@@ -467,16 +467,16 @@
 #endif
   int dots;
   union ink_res_sockaddr_union u[2];
-  int maxns = MAXNS;
+  int maxns = INK_MAXNS;
 
-  // RES_SET_H_ERRNO(statp, 0);
+  // INK_RES_SET_H_ERRNO(statp, 0);
   statp->res_h_errno = 0;
   if (statp->_u._ext.ext != NULL)
     ink_res_ndestroy(statp);
 
-  statp->retrans = RES_TIMEOUT;
-  statp->retry = RES_DFLRETRY;
-  statp->options = RES_DEFAULT;
+  statp->retrans = INK_RES_TIMEOUT;
+  statp->retry = INK_RES_DFLRETRY;
+  statp->options = INK_RES_DEFAULT;
   statp->id = ink_res_randomid();
 
   memset(u, 0, sizeof(u));
@@ -531,7 +531,7 @@
      * to check our return code wont be able to make
      * queries anyhow.
      */
-    // RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
+    // INK_RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
     statp->res_h_errno = NETDB_INTERNAL;
     maxns = 0;
   }
@@ -578,7 +578,7 @@
     cp = statp->defdname;
     pp = statp->dnsrch;
     *pp++ = cp;
-    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
+    for (n = 0; *cp && pp < statp->dnsrch + INK_MAXDNSRCH; cp++) {
       if (*cp == '\n')	/*%< silly backwards compat */
         break;
       else if (*cp == ' ' || *cp == '\t') {
@@ -630,7 +630,7 @@
     cp = statp->defdname;
     pp = statp->dnsrch;
     *pp++ = cp;
-    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
+    for (n = 0; *cp && pp < statp->dnsrch + INK_MAXDNSRCH; cp++) {
       if (*cp == ' ' || *cp == '\t') {
         *cp = 0;
         n = 1;
@@ -652,7 +652,7 @@
      we must be provided with atleast a named!
      ------------------------------------------- */
 
-  while (pHostList && pHostList[nserv] != 0 && nserv < MAXNS) {
+  while (pHostList && pHostList[nserv] != 0 && nserv < INK_MAXNS) {
     statp->nsaddr_list[nserv].sin_addr.s_addr = pHostList[nserv];
     statp->nsaddr_list[nserv].sin_family = AF_INET;
     statp->nsaddr_list[nserv].sin_port = htons(pPort[nserv]);
@@ -707,7 +707,7 @@
         cp = statp->defdname;
         pp = statp->dnsrch;
         *pp++ = cp;
-        for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
+        for (n = 0; *cp && pp < statp->dnsrch + INK_MAXDNSRCH; cp++) {
           if (*cp == ' ' || *cp == '\t') {
             *cp = 0;
             n = 1;
@@ -764,7 +764,7 @@
         struct in_addr a;
 
         cp = buf + sizeof("sortlist") - 1;
-        while (nsort < MAXRESOLVSORT) {
+        while (nsort < INK_MAXRESOLVSORT) {
           while (*cp == ' ' || *cp == '\t')
             cp++;
           if (*cp == '\0' || *cp == '\n' || *cp == ';')
@@ -840,8 +840,8 @@
       dots += (*cp == '.');
 
     cp = statp->defdname;
-    while (pp < statp->dnsrch + MAXDFLSRCH) {
-      if (dots < LOCALDOMAINPARTS)
+    while (pp < statp->dnsrch + INK_MAXDFLSRCH) {
+      if (dots < INK_LOCALDOMAINPARTS)
         break;
       cp = strchr(cp, '.') + 1;    /*%< we know there is one */
       *pp++ = cp;
@@ -849,7 +849,7 @@
     }
     *pp = NULL;
 #ifdef DEBUG
-    if (statp->options & RES_DEBUG) {
+    if (statp->options & INK_RES_DEBUG) {
       printf(";; res_init()... default dnsrch list:\n");
       for (pp = statp->dnsrch; *pp; pp++)
         printf(";;\t%s\n", *pp);
@@ -860,7 +860,7 @@
 
   if ((cp = getenv("RES_OPTIONS")) != NULL)
     ink_res_setoptions(statp, cp, "env");
-  statp->options |= RES_INIT;
+  statp->options |= INK_RES_INIT;
   return (statp->res_h_errno);
 }
 

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_res_mkquery.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc Fri Feb 19 05:37:28 2010
@@ -147,7 +147,7 @@
 	hp = (HEADER *) buf;
 	hp->id = htons(++statp->id);
 	hp->opcode = op;
-	hp->rd = (statp->options & RES_RECURSE) != 0U;
+	hp->rd = (statp->options & INK_RES_RECURSE) != 0U;
 	hp->rcode = NOERROR;
 	cp = buf + HFIXEDSZ;
 	ep = buf + buflen;
@@ -240,8 +240,8 @@
 		return(-1);
 	}
 
-	if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) {
-		if (l == DNS_LABELTYPE_BITSTRING) {
+	if ((l & NS_CMPRSFLGS) == INK_NS_TYPE_ELT) {
+		if (l == INK_DNS_LABELTYPE_BITSTRING) {
 			if ((bitlen = *(lp + 1)) == 0)
 				bitlen = 256;
 			return((bitlen + 7 ) / 8 + 1);
@@ -368,10 +368,10 @@
 			errno = EMSGSIZE;
 			return (-1);
 		}
-		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
+		if ((n & NS_CMPRSFLGS) == INK_NS_TYPE_ELT) {
 			int m;
 
-			if (n != DNS_LABELTYPE_BITSTRING) {
+			if (n != INK_DNS_LABELTYPE_BITSTRING) {
 				/* XXX: labellen should reject this case */
 				errno = EINVAL;
 				return(-1);
@@ -470,10 +470,10 @@
 			errno = EMSGSIZE;
 			return (-1);
 		}
-		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
+		if ((n & NS_CMPRSFLGS) == INK_NS_TYPE_ELT) {
 			int m;
 
-			if (n != DNS_LABELTYPE_BITSTRING) {
+			if (n != INK_DNS_LABELTYPE_BITSTRING) {
 				/* XXX: labellen should reject this case */
 				errno = EINVAL;
 				return(-1);

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_resolver.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_resolver.h Fri Feb 19 05:37:28 2010
@@ -80,14 +80,67 @@
 #include <net/ppp_defs.h>
 #endif
 
-#define RES_USE_DNSSEC 0x00200000 
-#define RES_NOTLDQUERY  0x00100000      /*%< don't unqualified name as a tld */
-#define RES_USE_DNAME   0x10000000      /*%< use DNAME */
-#define RES_NO_NIBBLE2  0x80000000      /*%< disable alternate nibble lookup */
-#define NS_TYPE_ELT  0x40 /*%< EDNS0 extended label type */
-#define DNS_LABELTYPE_BITSTRING 0x41
+#define INK_RES_F_VC        0x00000001      /*%< socket is TCP */
+#define INK_RES_F_CONN      0x00000002      /*%< socket is connected */
+#define INK_RES_F_EDNS0ERR  0x00000004      /*%< EDNS0 caused errors */
+#define INK_RES_F__UNUSED   0x00000008      /*%< (unused) */
+#define INK_RES_F_LASTMASK  0x000000F0      /*%< ordinal server of last res_nsend */
+#define INK_RES_F_LASTSHIFT 4               /*%< bit position of LASTMASK "flag" */
+#define INK_RES_GETLAST(res) (((res)._flags & INK_RES_F_LASTMASK) >> INK_RES_F_LASTSHIFT)
+
+/* res_findzonecut2() options */
+#define INK_RES_EXHAUSTIVE  0x00000001      /*%< always do all queries */
+#define INK_RES_IPV4ONLY    0x00000002      /*%< IPv4 only */
+#define INK_RES_IPV6ONLY    0x00000004      /*%< IPv6 only */
+
+/*%
+ *  * Resolver options (keep these in synch with res_debug.c, please)
+ *   */
+#define INK_RES_INIT        0x00000001      /*%< address initialized */
+#define INK_RES_DEBUG       0x00000002      /*%< print debug messages */
+#define INK_RES_AAONLY      0x00000004      /*%< authoritative answers only (!IMPL)*/
+#define INK_RES_USEVC       0x00000008      /*%< use virtual circuit */
+#define INK_RES_PRIMARY     0x00000010      /*%< query primary server only (!IMPL) */
+#define INK_RES_IGNTC       0x00000020      /*%< ignore trucation errors */
+#define INK_RES_RECURSE     0x00000040      /*%< recursion desired */
+#define INK_RES_DEFNAMES    0x00000080      /*%< use default domain name */
+#define INK_RES_STAYOPEN    0x00000100      /*%< Keep TCP socket open */
+#define INK_RES_DNSRCH      0x00000200      /*%< search up local domain tree */
+#define INK_RES_INSECURE1   0x00000400      /*%< type 1 security disabled */
+#define INK_RES_INSECURE2   0x00000800      /*%< type 2 security disabled */
+#define INK_RES_NOALIASES   0x00001000      /*%< shuts off HOSTALIASES feature */
+#define INK_RES_USE_INET6   0x00002000      /*%< use/map IPv6 in gethostbyname() */
+#define INK_RES_ROTATE      0x00004000      /*%< rotate ns list after each query */
+#define INK_RES_NOCHECKNAME 0x00008000      /*%< do not check names for sanity. */
+#define INK_RES_KEEPTSIG    0x00010000      /*%< do not strip TSIG records */
+#define INK_RES_BLAST       0x00020000      /*%< blast all recursive servers */
+#define INK_RES_NSID        0x00040000      /*%< request name server ID */
+#define INK_RES_NOTLDQUERY  0x00100000      /*%< don't unqualified name as a tld */
+#define INK_RES_USE_DNSSEC  0x00200000      /*%< use DNSSEC using OK bit in OPT */
+/* #define INK_RES_DEBUG2   0x00400000 */   /* nslookup internal */
+/* KAME extensions: use higher bit to avoid conflict with ISC use */
+#define INK_RES_USE_DNAME   0x10000000      /*%< use DNAME */
+#define INK_RES_USE_EDNS0   0x40000000      /*%< use EDNS0 if configured */
+#define INK_RES_NO_NIBBLE2  0x80000000      /*%< disable alternate nibble lookup */
+
+#define INK_RES_DEFAULT     (INK_RES_RECURSE | INK_RES_DEFNAMES | \
+                         INK_RES_DNSRCH | INK_RES_NO_NIBBLE2)
+
+#define INK_MAXNS                   32      /*%< max # name servers we'll track */
+#define INK_MAXDFLSRCH              3       /*%< # default domain levels to try */
+#define INK_MAXDNSRCH               6       /*%< max # domains in search path */
+#define INK_LOCALDOMAINPARTS        2       /*%< min levels in name that is "local" */
+#define INK_RES_TIMEOUT             5       /*%< min. seconds between retries */
+#define INK_MAXRESOLVSORT           10      /*%< number of net to sort on */
+#define INK_RES_TIMEOUT             5       /*%< min. seconds between retries */
+#define INK_RES_MAXNDOTS            15      /*%< should reflect bit field size */
+#define INK_RES_MAXRETRANS          30      /*%< only for resolv.conf/RES_OPTIONS */
+#define INK_RES_MAXRETRY            5       /*%< only for resolv.conf/RES_OPTIONS */
+#define INK_RES_DFLRETRY            2       /*%< Default #/tries. */
+#define INK_RES_MAXTIME             65535   /*%< Infinity, in milliseconds. */
 
-#define MAXNSRR 32
+#define INK_NS_TYPE_ELT  0x40 /*%< EDNS0 extended label type */
+#define INK_DNS_LABELTYPE_BITSTRING 0x41
 
 #ifndef NS_GET16
 #define NS_GET16(s, cp) do { \
@@ -143,7 +196,7 @@
 #endif
   int     nscount;                /*%< number of name servers */
   struct sockaddr_in
-  nsaddr_list[MAXNSRR];     /*%< address of name server */
+  nsaddr_list[INK_MAXNS];     /*%< address of name server */
 #define nsaddr  nsaddr_list[0]          /*%< for backward compatibility */
   u_short id;                     /*%< current message id */
   char    *dnsrch[MAXDNSRCH+1];   /*%< components of domain to search */
@@ -171,8 +224,8 @@
     char    pad[72 - 4*sizeof (int) - 2*sizeof (void *)];
     struct {
       u_int16_t               nscount;
-      u_int16_t               nstimes[MAXNSRR]; /*%< ms. */
-      int                     nssocks[MAXNSRR];
+      u_int16_t               nstimes[INK_MAXNS]; /*%< ms. */
+      int                     nssocks[INK_MAXNS];
       struct __ink_res_state_ext *ext;    /*%< extention for IPv6 */
     } _ext;
   } _u;
@@ -193,7 +246,7 @@
 };
 
 struct __ink_res_state_ext {
-        union ink_res_sockaddr_union nsaddrs[MAXNSRR];
+        union ink_res_sockaddr_union nsaddrs[INK_MAXNS];
         struct sort_list {
                 int     af;
                 union {

Propchange: incubator/trafficserver/traffic/branches/dev/librecords/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,6 @@
 Makefile.in
+Makefile
+libreclocal.a
+librecprocess.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,10 @@
 Makefile.in
+Makefile
+traffic_cust_log_fmt_cnvrt
+traffic_logcat
+traffic_logstats
+traffic_sac
+traffic_server
+.deps
+.libs
+

Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc Fri Feb 19 05:37:28 2010
@@ -50,7 +50,7 @@
 #include "LogConfig.h"
 //#include "UserNameCache.h"
 #include "PluginVC.h"
-#include "api/include/InkAPIPrivate.h"
+#include "api/include/ts_private.h"
 #include "ICP.h"
 #include "HttpAccept.h"
 #include "PluginVC.h"
@@ -5571,81 +5571,6 @@
   return INK_SUCCESS;
 }
 
-// YTS Team, yamsat Plugin
-// This API is to create new request to the redirected url
-// by setting API INKHttpTxnRedirectRequest
-int
-INKHttpTxnCreateRequest(INKHttpTxn txnp, const char *hostname, const char *path, int port)
-{
-  HttpSM *sm = (HttpSM *) txnp;
-  HttpTransact::State * s = &(sm->t_state);
-  if (sm->enable_redirection) {
-    INKMBuffer bufp_resp = NULL;
-    INKMLoc hdrresp_loc = NULL;
-
-    INKHttpTxnClientRespGet(txnp, &bufp_resp, &hdrresp_loc);
-    //Checking for 302 and 301 response codes
-    if (INK_HTTP_STATUS_MOVED_TEMPORARILY == (INKHttpHdrStatusGet(bufp_resp, hdrresp_loc)) ||
-        INK_HTTP_STATUS_MOVED_PERMANENTLY == (INKHttpHdrStatusGet(bufp_resp, hdrresp_loc))) {
-
-      INKMBuffer redirBuf;
-      INKMLoc redirLoc;
-      int redir_url_length;
-      int re;
-
-      redirBuf = INKMBufferCreate();
-      redirLoc = INKUrlCreate(redirBuf);
-
-      INKUrlSchemeSet(redirBuf, redirLoc, INK_URL_SCHEME_HTTPS, INK_URL_LEN_HTTPS);
-      INKUrlHostSet(redirBuf, redirLoc, hostname, strlen(hostname));
-      INKUrlPortSet(redirBuf, redirLoc, port);
-      INKUrlPathSet(redirBuf, redirLoc, path, strlen(path));
-
-      const char *url_redir_str = INKUrlStringGet(redirBuf, redirLoc, &redir_url_length);
-      INKDebug("http", "Redirect URL in createReequest = \'%s\'\n", url_redir_str);
-
-      re = INKUrlParse(redirBuf, redirLoc, &url_redir_str, (url_redir_str + strlen(url_redir_str)));
-      if (re != INK_PARSE_DONE) {
-        INKDebug("INKHttpTxnCreateRequest", "\n CreateRequest: INKParse failed ");
-        INKMBufferDestroy(&redirBuf);
-        return 0;
-      }
-
-      re = INKHttpTxnRedirectRequest(txnp, redirBuf, redirLoc);
-
-      INKMBuffer req_bufp = NULL;
-      INKMLoc req_loc = NULL;
-      INKMLoc new_field_loc;
-      std::string HOSTNAME;
-      char *temp = NULL;
-      size_t temp_size = 4 * sizeof(int);
-      temp = (char *) xmalloc(temp_size);
-
-      if (!INKHttpTxnClientReqGet(txnp, &req_bufp, &req_loc)) {
-        INKError("Error");
-      }
-
-      HOSTNAME += hostname;
-      HOSTNAME += ":";
-      snprintf(temp, temp_size, "%d", port);
-      HOSTNAME += temp;
-
-      new_field_loc = INKMimeHdrFieldFind(req_bufp, req_loc, "Host", 4);
-      INKMimeHdrFieldValueSet(req_bufp, req_loc, new_field_loc, -1, HOSTNAME.c_str(), strlen(HOSTNAME.c_str()));
-      INKHandleMLocRelease(req_bufp, req_loc, new_field_loc);
-
-      DUMP_HEADER("http_hdrs", &s->hdr_info.client_request, sm->sm_id, "Framed Client Request..checking");
-
-      return 0;
-    } else if (200 == (INKHttpHdrStatusGet(bufp_resp, hdrresp_loc))) {
-      sm->enable_redirection = false;
-    }
-    return 0;
-  }
-  return 0;
-}
-
-
 int
 INKHttpTxnRedirectRequest(INKHttpTxn txnp, INKMBuffer bufp, INKMLoc url_loc)
 {
@@ -6342,7 +6267,7 @@
 
 /* This is kinda horky, we have to use INKServerState instead of
    HttpTransact::ServerState_t, otherwise we have a prototype
-   mismatch in the public InkAPI.h interfaces. */
+   mismatch in the public ts/ts.h interfaces. */
 INKServerState
 INKHttpTxnServerStateGet(INKHttpTxn txnp)
 {
@@ -9026,5 +8951,48 @@
   info->object_size_set(size);
 }
 
+// this function should be called at INK_EVENT_HTTP_READ_RESPONSE_HDR
+INKReturnCode INKRedirectUrlSet(INKHttpTxn txnp, const char* url, const int url_len)
+{
+  if (url == NULL) {
+    return INK_ERROR;
+  }
+  if (sdk_sanity_check_txn(txnp)!=INK_SUCCESS) {
+    return INK_ERROR;
+  }
+  HttpSM *sm = (HttpSM*) txnp;
+
+  if (sm->redirect_url != NULL) {
+    xfree(sm->redirect_url);
+    sm->redirect_url = NULL;
+    sm->redirect_url_len = 0;
+  }
+
+  if ((sm->redirect_url = (char*)xmalloc(url_len + 1)) != NULL) {
+    ink_strncpy(sm->redirect_url, (char*)url, url_len + 1);
+    sm->redirect_url_len = url_len;
+    // have to turn redirection on for this transaction if user wants to redirect to another URL
+    if (sm->enable_redirection == false) {
+      sm->enable_redirection = true;
+      // max-out "redirection_tries" to avoid the regular redirection being turned on in
+      // this transaction improperly. This variable doesn't affect the custom-redirection
+      sm->redirection_tries = HttpConfig::m_master.number_of_redirections;
+    }
+    return INK_SUCCESS;
+  }
+  else {
+    return INK_ERROR;
+  }
+}
+
+const char* INKRedirectUrlGet(INKHttpTxn txnp, int* url_len_ptr)
+{
+  if (sdk_sanity_check_txn(txnp)!=INK_SUCCESS) {
+    return NULL;
+  }
+  HttpSM *sm = (HttpSM*) txnp;
+  *url_len_ptr = sm->redirect_url_len;
+  return (const char*)sm->redirect_url;
+}
 
 #endif //INK_NO_API

Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h Fri Feb 19 05:37:28 2010
@@ -28,7 +28,7 @@
 #include "URL.h"
 #include "StatSystem.h"
 #include "P_Net.h"
-#include "api/include/InkAPIPrivateFrozen.h"
+#include "api/include/ts_private_frozen.h"
 //#include "MixtAPIInternal.h"
 #include "HTTP.h"
 #include "List.h"



Mime
View raw message