You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/03/16 22:25:36 UTC
svn commit: r923986 - in /incubator/trafficserver/traffic/trunk:
example/add-header/ example/append-transform/ example/basic-auth/
example/blacklist-0/ example/blacklist-1/ example/bnull-transform/
example/file-1/ example/hello/ example/null-transform/...
Author: zwoop
Date: Tue Mar 16 21:25:35 2010
New Revision: 923986
URL: http://svn.apache.org/viewvc?rev=923986&view=rev
Log:
TS-249: Change INK_SDK_VERSION_5_2 to INK_SDK_VERSION_2_0, and remove all other versions. We'll postpone the change to "TS_SDK_VERSION" until later.
Modified:
incubator/trafficserver/traffic/trunk/example/add-header/add-header.c
incubator/trafficserver/traffic/trunk/example/append-transform/append-transform.c
incubator/trafficserver/traffic/trunk/example/basic-auth/basic-auth.c
incubator/trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c
incubator/trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c
incubator/trafficserver/traffic/trunk/example/bnull-transform/bnull-transform.c
incubator/trafficserver/traffic/trunk/example/file-1/file-1.c
incubator/trafficserver/traffic/trunk/example/hello/hello.c
incubator/trafficserver/traffic/trunk/example/null-transform/null-transform.c
incubator/trafficserver/traffic/trunk/example/output-header/output-header.c
incubator/trafficserver/traffic/trunk/example/prefetch/prefetch-plugin-eg1.c
incubator/trafficserver/traffic/trunk/example/prefetch/test-hns-plugin.c
incubator/trafficserver/traffic/trunk/example/protocol/Protocol.c
incubator/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
incubator/trafficserver/traffic/trunk/example/remap/remap.cc
incubator/trafficserver/traffic/trunk/example/replace-header/replace-header.c
incubator/trafficserver/traffic/trunk/example/response-header-1/response-header-1.c
incubator/trafficserver/traffic/trunk/example/server-transform/server-transform.c
incubator/trafficserver/traffic/trunk/example/session-1/session-1.c
incubator/trafficserver/traffic/trunk/example/thread-1/thread-1.c
incubator/trafficserver/traffic/trunk/example/thread-pool/psi.c
incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h
incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h
incubator/trafficserver/traffic/trunk/test/plugin/assembly/assembly.c
incubator/trafficserver/traffic/trunk/test/plugin/blacklist-1-neg/blacklist-1-neg.c
incubator/trafficserver/traffic/trunk/test/plugin/check-constants/check-constants.c
incubator/trafficserver/traffic/trunk/test/plugin/cluster-RPC/clusterRPC.c
incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/http_connect_bridge.c
incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/net_bridge.c
incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/serve_file.c
incubator/trafficserver/traffic/trunk/test/plugin/redirect-1-neg/redirect-1-neg.c
incubator/trafficserver/traffic/trunk/test/plugin/test-transform/test-transform.c
Modified: incubator/trafficserver/traffic/trunk/example/add-header/add-header.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/add-header/add-header.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/add-header/add-header.c (original)
+++ incubator/trafficserver/traffic/trunk/example/add-header/add-header.c Tue Mar 16 21:25:35 2010
@@ -140,13 +140,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -165,13 +161,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("[PluginInit] Plugin registration failed.\n");
goto error;
}
if (!check_ts_version()) {
- INKError("[PluginInit] Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
goto error;
}
Modified: incubator/trafficserver/traffic/trunk/example/append-transform/append-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/append-transform/append-transform.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/append-transform/append-transform.c (original)
+++ incubator/trafficserver/traffic/trunk/example/append-transform/append-transform.c Tue Mar 16 21:25:35 2010
@@ -376,13 +376,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -399,13 +395,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
goto Lerror;
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
goto Lerror;
}
Modified: incubator/trafficserver/traffic/trunk/example/basic-auth/basic-auth.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/basic-auth/basic-auth.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/basic-auth/basic-auth.c (original)
+++ incubator/trafficserver/traffic/trunk/example/basic-auth/basic-auth.c Tue Mar 16 21:25:35 2010
@@ -263,13 +263,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -287,12 +283,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c (original)
+++ incubator/trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c Tue Mar 16 21:25:35 2010
@@ -166,13 +166,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -190,13 +186,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c Tue Mar 16 21:25:35 2010
@@ -367,13 +367,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -392,12 +388,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/bnull-transform/bnull-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/bnull-transform/bnull-transform.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/bnull-transform/bnull-transform.c (original)
+++ incubator/trafficserver/traffic/trunk/example/bnull-transform/bnull-transform.c Tue Mar 16 21:25:35 2010
@@ -338,13 +338,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -362,13 +358,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("[bnull-transform] Plugin registration failed.\n");
goto Lerror;
}
if (!check_ts_version()) {
- INKError("[bnull-transform] Plugin requires Traffic Server 5.2.0" " or later\n");
+ INKError("[bnull-transform] Plugin requires Traffic Server 2.0" " or later\n");
goto Lerror;
}
Modified: incubator/trafficserver/traffic/trunk/example/file-1/file-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/file-1/file-1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/file-1/file-1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/file-1/file-1.c Tue Mar 16 21:25:35 2010
@@ -53,13 +53,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -78,12 +74,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/hello/hello.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/hello/hello.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/hello/hello.c (original)
+++ incubator/trafficserver/traffic/trunk/example/hello/hello.c Tue Mar 16 21:25:35 2010
@@ -51,13 +51,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -73,12 +69,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed. \n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/null-transform/null-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/null-transform/null-transform.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/null-transform/null-transform.c (original)
+++ incubator/trafficserver/traffic/trunk/example/null-transform/null-transform.c Tue Mar 16 21:25:35 2010
@@ -351,13 +351,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -374,13 +370,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("[null-transform] Plugin registration failed.\n");
goto Lerror;
}
if (!check_ts_version()) {
- INKError("[null-transform] Plugin requires Traffic Server 5.2.0 " "or later\n");
+ INKError("[null-transform] Plugin requires Traffic Server 2.0 " "or later\n");
goto Lerror;
}
Modified: incubator/trafficserver/traffic/trunk/example/output-header/output-header.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/output-header/output-header.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/output-header/output-header.c (original)
+++ incubator/trafficserver/traffic/trunk/example/output-header/output-header.c Tue Mar 16 21:25:35 2010
@@ -229,13 +229,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -251,13 +247,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("[PluginInit] Plugin registration failed.\n");
goto error;
}
if (!check_ts_version()) {
- INKError("[PluginInit] Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
goto error;
}
Modified: incubator/trafficserver/traffic/trunk/example/prefetch/prefetch-plugin-eg1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/prefetch/prefetch-plugin-eg1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/prefetch/prefetch-plugin-eg1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/prefetch/prefetch-plugin-eg1.c Tue Mar 16 21:25:35 2010
@@ -46,7 +46,7 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
Modified: incubator/trafficserver/traffic/trunk/example/prefetch/test-hns-plugin.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/prefetch/test-hns-plugin.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/prefetch/test-hns-plugin.c (original)
+++ incubator/trafficserver/traffic/trunk/example/prefetch/test-hns-plugin.c Tue Mar 16 21:25:35 2010
@@ -194,7 +194,7 @@ INKPluginInit(int argc, const char *argv
plugin_info.vendor_name = "MyCompany";
plugin_info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &plugin_info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &plugin_info)) {
INKError("Plugin registration failed.\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/protocol/Protocol.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/protocol/Protocol.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/protocol/Protocol.c (original)
+++ incubator/trafficserver/traffic/trunk/example/protocol/Protocol.c Tue Mar 16 21:25:35 2010
@@ -115,13 +115,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -138,13 +134,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("[PluginInit] Plugin registration failed.\n");
goto error;
}
if (!check_ts_version()) {
- INKError("[PluginInit] Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
goto error;
}
Modified: incubator/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c Tue Mar 16 21:25:35 2010
@@ -374,13 +374,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -399,12 +395,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/remap/remap.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/remap/remap.cc?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/remap/remap.cc (original)
+++ incubator/trafficserver/traffic/trunk/example/remap/remap.cc Tue Mar 16 21:25:35 2010
@@ -182,7 +182,7 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "Apache";
info.support_email = "";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed. \n");
}
INKDebug("debug-remap", "INKPluginInit: Remap plugin started\n");
Modified: incubator/trafficserver/traffic/trunk/example/replace-header/replace-header.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/replace-header/replace-header.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/replace-header/replace-header.c (original)
+++ incubator/trafficserver/traffic/trunk/example/replace-header/replace-header.c Tue Mar 16 21:25:35 2010
@@ -105,13 +105,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -128,12 +124,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed. \n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/response-header-1/response-header-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/response-header-1/response-header-1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/response-header-1/response-header-1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/response-header-1/response-header-1.c Tue Mar 16 21:25:35 2010
@@ -258,13 +258,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -285,12 +281,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/server-transform/server-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/server-transform/server-transform.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/server-transform/server-transform.c (original)
+++ incubator/trafficserver/traffic/trunk/example/server-transform/server-transform.c Tue Mar 16 21:25:35 2010
@@ -828,18 +828,10 @@ check_ts_version()
return 0;
}
- /* Since this is an TS-SDK 5.2 plugin, we need at
- least Traffic Server 5.2.0 to run */
- if (major_ts_version > 5) {
+ /* Since this is an TS-SDK 2.0 plugin, we need at
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version > 2) {
- result = 1;
- } else if (minor_ts_version == 2) {
- if (patch_ts_version >= 0) {
- result = 1;
- }
- }
}
}
@@ -856,12 +848,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/session-1/session-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/session-1/session-1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/session-1/session-1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/session-1/session-1.c Tue Mar 16 21:25:35 2010
@@ -102,13 +102,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -126,13 +122,13 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("[PluginInit] Plugin registration failed.\n");
goto error;
}
if (!check_ts_version()) {
- INKError("[PluginInit] Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
goto error;
}
Modified: incubator/trafficserver/traffic/trunk/example/thread-1/thread-1.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/thread-1/thread-1.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/thread-1/thread-1.c (original)
+++ incubator/trafficserver/traffic/trunk/example/thread-1/thread-1.c Tue Mar 16 21:25:35 2010
@@ -79,13 +79,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -104,12 +100,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/example/thread-pool/psi.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/example/thread-pool/psi.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/example/thread-pool/psi.c (original)
+++ incubator/trafficserver/traffic/trunk/example/thread-pool/psi.c Tue Mar 16 21:25:35 2010
@@ -1143,7 +1143,7 @@ read_response_handler(INKCont contp, INK
/*-------------------------------------------------------------------------
check_ts_version
- Make sure TS version is at least 5.2
+ Make sure TS version is at least 2.0
Input:
Output :
@@ -1167,13 +1167,9 @@ check_ts_version()
return 0;
}
- /* Need at least TS 5.2 */
- if (major_ts_version > 5) {
+ /* Need at least TS 2.0 */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 5) {
- if (minor_ts_version >= 2) {
- result = 1;
- }
}
}
@@ -1202,12 +1198,12 @@ INKPluginInit(int argc, const char *argv
info.vendor_name = "Apache";
info.support_email = "";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.2.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h Tue Mar 16 21:25:35 2010
@@ -60,7 +60,7 @@
#define CACHE_HTTP_TYPE 1
#define CACHE_RTSP_TYPE 2
// NOTE: All the failures are ODD, and one greater than the success
-// Some of these must match those in InkAPI.h (tested in verify_cache_api())
+// Some of these must match those in <ts/ts.h> (tested in verify_cache_api())
enum CacheEventType
{
CACHE_EVENT_LOOKUP = CACHE_EVENT_EVENTS_START + 0,
Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Mar 16 21:25:35 2010
@@ -1871,7 +1871,7 @@ INKPluginRegister(INKSDKVersion sdk_vers
plugin_reg_current->plugin_registered = true;
- if (sdk_version >= INK_SDK_VERSION_1_0 && sdk_version <= INK_SDK_VERSION_5_2) {
+ if (sdk_version >= INK_SDK_VERSION_2_0 && sdk_version <= INK_SDK_VERSION_2_0) {
plugin_reg_current->sdk_version = (PluginSDKVersion) sdk_version;
} else {
plugin_reg_current->sdk_version = PLUGIN_SDK_VERSION_UNKNOWN;
@@ -1894,8 +1894,7 @@ INKPluginRegister(INKSDKVersion sdk_vers
////////////////////////////////////////////////////////////////////
//
-// Plugin info registration - coded in 5.2, but not documented and
-// not supported in 5.2
+// Plugin info registration - coded in 2.0, but not documented
//
////////////////////////////////////////////////////////////////////
Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc Tue Mar 16 21:25:35 2010
@@ -142,7 +142,7 @@ REGRESSION_TEST(SDK_API_INKPluginRegiste
info.vendor_name = "my_company";
info.support_email = "ts-api-support@my_company.com";
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
SDK_RPRINT(test, "INKPluginRegister", "TestCase1", TC_FAIL, "can't register plugin");
*pstatus = REGRESSION_TEST_FAILED;
return;
@@ -6746,10 +6746,7 @@ typedef enum
typedef enum
{
- ORIG_INK_SDK_VERSION_1_0 = 0,
- ORIG_INK_SDK_VERSION_1_1,
- ORIG_INK_SDK_VERSION_2_0,
- ORIG_INK_SDK_VERSION_5_2
+ ORIG_INK_SDK_VERSION_2_0 = 0,
} ORIG_INKSDKVersion;
typedef enum
@@ -6904,10 +6901,7 @@ REGRESSION_TEST(SDK_API_INKConstant) (Re
PRINT_DIFF(INK_VC_CLOSE_ABORT);
PRINT_DIFF(INK_VC_CLOSE_NORMAL);
- PRINT_DIFF(INK_SDK_VERSION_1_0);
- PRINT_DIFF(INK_SDK_VERSION_1_1);
PRINT_DIFF(INK_SDK_VERSION_2_0);
- PRINT_DIFF(INK_SDK_VERSION_5_2);
PRINT_DIFF(INK_ERROR);
PRINT_DIFF(INK_SUCCESS);
Modified: incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h Tue Mar 16 21:25:35 2010
@@ -426,16 +426,12 @@ extern "C"
} INKIOBufferSizeIndex;
/**
- Starting 5.2, SDK now follows same versioning as Traffic Server.
+ Starting 2.0, SDK now follows same versioning as Traffic Server.
*/
typedef enum
{
- INK_SDK_VERSION_1_0 = 0,
- INK_SDK_VERSION_1_1,
- INK_SDK_VERSION_2_0,
- INK_SDK_VERSION_5_2,
- INK_SDK_VERSION_5_5
+ INK_SDK_VERSION_2_0 = 0,
} INKSDKVersion;
typedef enum
Modified: incubator/trafficserver/traffic/trunk/test/plugin/assembly/assembly.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/assembly/assembly.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/assembly/assembly.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/assembly/assembly.c Tue Mar 16 21:25:35 2010
@@ -2682,17 +2682,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -2722,7 +2714,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/test/plugin/blacklist-1-neg/blacklist-1-neg.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/blacklist-1-neg/blacklist-1-neg.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/blacklist-1-neg/blacklist-1-neg.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/blacklist-1-neg/blacklist-1-neg.c Tue Mar 16 21:25:35 2010
@@ -365,17 +365,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -399,7 +391,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/test/plugin/check-constants/check-constants.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/check-constants/check-constants.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/check-constants/check-constants.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/check-constants/check-constants.c Tue Mar 16 21:25:35 2010
@@ -186,9 +186,7 @@ typedef enum
typedef enum
{
- ORIG_INK_SDK_VERSION_1_0 = 0,
- ORIG_INK_SDK_VERSION_1_1,
- ORIG_INK_SDK_VERSION_2_0
+ ORIG_INK_SDK_VERSION_2_0 = 0,
} ORIG_INKSDKVersion;
@@ -318,7 +316,7 @@ INKPluginInit(int argc, const char *argv
PRINT_DIFF("INK_VC_CLOSE_ABORT", INK_VC_CLOSE_ABORT, ORIG_INK_VC_CLOSE_ABORT);
PRINT_DIFF("INK_VC_CLOSE_NORMAL", INK_VC_CLOSE_NORMAL, ORIG_INK_VC_CLOSE_NORMAL);
- PRINT_DIFF("INK_SDK_VERSION_1_0", INK_SDK_VERSION_1_0, ORIG_INK_SDK_VERSION_1_0);
+ PRINT_DIFF("INK_SDK_VERSION_2_0", INK_SDK_VERSION_2_0, ORIG_INK_SDK_VERSION_2_0);
if (file_changed) {
printf("\n***************************************************************************************");
Modified: incubator/trafficserver/traffic/trunk/test/plugin/cluster-RPC/clusterRPC.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/cluster-RPC/clusterRPC.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/cluster-RPC/clusterRPC.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/cluster-RPC/clusterRPC.c Tue Mar 16 21:25:35 2010
@@ -107,17 +107,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -138,7 +130,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
clusterRPC_init();
Modified: incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/http_connect_bridge.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/http_connect_bridge.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/http_connect_bridge.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/http_connect_bridge.c Tue Mar 16 21:25:35 2010
@@ -500,17 +500,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -539,7 +531,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 5.0.0 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/net_bridge.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/net_bridge.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/net_bridge.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/net_bridge.c Tue Mar 16 21:25:35 2010
@@ -708,18 +708,10 @@ check_ts_version()
return 0;
}
- /* Since this is an TS-SDK 5.2 plugin, we need at
- least Traffic Server 5.2 to run */
- if (major_ts_version > 3) {
+ /* Since this is an TS-SDK 2.0 plugin, we need at
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -746,7 +738,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/serve_file.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/serve_file.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/serve_file.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/plugin_as_origin/serve_file.c Tue Mar 16 21:25:35 2010
@@ -355,17 +355,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -424,17 +416,17 @@ INKPluginInit(int argc, const char *argv
/* NEGATIVE TEST for INKPluginRegister */
#ifdef DEBUG
- if (INKPluginRegister(INK_SDK_VERSION_5_2, NULL) != 0) {
+ if (INKPluginRegister(INK_SDK_VERSION_2_0, NULL) != 0) {
LOG_ERROR_NEG("INKPluginRegister");
} else
INKDebug(NEG_DEBUG_TAG, "Negative Test INKPluginRegister 1 passed");
#endif
- if (!INKPluginRegister(INK_SDK_VERSION_5_2, &info)) {
+ if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
INKError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/test/plugin/redirect-1-neg/redirect-1-neg.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/redirect-1-neg/redirect-1-neg.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/redirect-1-neg/redirect-1-neg.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/redirect-1-neg/redirect-1-neg.c Tue Mar 16 21:25:35 2010
@@ -445,17 +445,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -478,7 +470,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
Modified: incubator/trafficserver/traffic/trunk/test/plugin/test-transform/test-transform.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/test/plugin/test-transform/test-transform.c?rev=923986&r1=923985&r2=923986&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/test/plugin/test-transform/test-transform.c (original)
+++ incubator/trafficserver/traffic/trunk/test/plugin/test-transform/test-transform.c Tue Mar 16 21:25:35 2010
@@ -641,17 +641,9 @@ check_ts_version()
}
/* Since this is an TS-SDK 2.0 plugin, we need at
- least Traffic Server 3.5.2 to run */
- if (major_ts_version > 3) {
+ least Traffic Server 2.0 to run */
+ if (major_ts_version >= 2) {
result = 1;
- } else if (major_ts_version == 3) {
- if (minor_ts_version > 5) {
- result = 1;
- } else if (minor_ts_version == 5) {
- if (patch_ts_version >= 2) {
- result = 1;
- }
- }
}
}
@@ -673,7 +665,7 @@ INKPluginInit(int argc, const char *argv
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 3.5.2 or later\n");
+ INKError("Plugin requires Traffic Server 2.0 or later\n");
return;
}