Updated Branches: refs/heads/5.0.x e08d57fb5 -> 6629f2016
TS-2195 Remove the (deprecated) TSHttpTxnCacheLookupSkip API Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6629f201 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6629f201 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6629f201 Branch: refs/heads/5.0.x Commit: 6629f2016f3410d3beab85a77b5b903885a1266a Parents: e08d57f Author: Leif Hedstrom <[email protected]> Authored: Thu Jan 30 17:13:45 2014 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Thu Jan 30 17:13:45 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ proxy/InkAPI.cc | 8 -------- proxy/api/ts/experimental.h | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6629f201/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 3aba18a..04f8583 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2195] Remove the (deprecated) TSHttpTxnCacheLookupSkip API. + *) [TS-2229] Deprecate the header_filter plugin, use header_rewrite instead. *) [TS-2290] Remove X-ID special log tag, and cleanup HdrToken confusion. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6629f201/proxy/InkAPI.cc ---------------------------------------------------------------------- diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc index a0f752f..01d1836 100644 --- a/proxy/InkAPI.cc +++ b/proxy/InkAPI.cc @@ -5039,14 +5039,6 @@ TSHttpTxnNoActivityTimeoutSet(TSHttpTxn txnp, int timeout) s->api_txn_no_activity_timeout_value = timeout; } - -// TS-2196: TSHttpTxnCacheLookupSkip will be removed in the 5.x release. -TSReturnCode -TSHttpTxnCacheLookupSkip(TSHttpTxn txnp) -{ - return TSHttpTxnConfigIntSet(txnp, TS_CONFIG_HTTP_CACHE_HTTP, 0); -} - TSReturnCode TSHttpTxnServerRespNoStoreSet(TSHttpTxn txnp, int flag) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6629f201/proxy/api/ts/experimental.h ---------------------------------------------------------------------- diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h index 9fefb19..d926fd8 100644 --- a/proxy/api/ts/experimental.h +++ b/proxy/api/ts/experimental.h @@ -187,10 +187,6 @@ extern "C" tsapi TSReturnCode TSHttpTxnShutDown(TSHttpTxn txnp, TSEvent event); tsapi TSReturnCode TSHttpTxnCloseAfterResponse(TSHttpTxn txnp, int should_close); - /* TS-2195: TSHttpTxnCacheLookupSkip() is deprecated, because TSHttpTxnConfigIntSet(txn, TS_CONFIG_HTTP_CACHE_HTTP, 0) - does the same thing, but better. TSHttpTxnCacheLookupSkip will be removed in TrafficServer 5.0. */ - tsapi TS_DEPRECATED TSReturnCode TSHttpTxnCacheLookupSkip(TSHttpTxn txnp); - /* TS-1996: These API swill be removed after v3.4.0 is cut. Do not use them! */ tsapi TSReturnCode TSHttpTxnNewCacheLookupDo(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc); tsapi TSReturnCode TSHttpTxnSecondUrlTryLock(TSHttpTxn txnp);
