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 2013/07/12 17:50:48 UTC
git commit: TS-1997 Remove TSHttpTxnCachedUrlSet() API.
Updated Branches:
refs/heads/master 5eabd1467 -> 0f6165c03
TS-1997 Remove TSHttpTxnCachedUrlSet() API.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0f6165c0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0f6165c0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0f6165c0
Branch: refs/heads/master
Commit: 0f6165c031ab674a14cc1b7b2e9771b4a5381558
Parents: 5eabd14
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jul 12 09:50:32 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Jul 12 09:50:32 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/InkAPI.cc | 25 -------------------------
proxy/api/ts/ts.h.in | 1 -
proxy/http/HttpSM.cc | 5 +----
proxy/http/HttpTransact.cc | 17 ++++++-----------
proxy/http/HttpTransact.h | 3 ---
6 files changed, 9 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f6165c0/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7573f2e..72ea626 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 3.3.5
+ *) [TS-1997] Remove TSHttpTxnCachedUrlSet() API.
+
*) [TS-2028] Config parse problems in healthchecks plugin.
*) [TS-1966] Add new configuration option to control ProxyAllocator size.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f6165c0/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 209dd0b..03a6d56 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -4877,31 +4877,6 @@ TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj)
}
TSReturnCode
-TSHttpTxnCachedUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj)
-{
- sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- sdk_assert(sdk_sanity_check_mbuffer(bufp) == TS_SUCCESS);
- sdk_assert(sdk_sanity_check_url_handle(obj) == TS_SUCCESS);
-
- HttpSM *sm = (HttpSM *) txnp;
- URL u, *s_url;
-
- u.m_heap = ((HdrHeapSDKHandle *) bufp)->m_heap;
- u.m_url_impl = (URLImpl *) obj;
- if (!u.valid())
- return TS_ERROR;
-
- s_url = &(sm->t_state.cache_info.store_url);
- if (!s_url->valid())
- s_url->create(NULL);
- s_url->copy(&u);
- if (sm->decide_cached_url(&u))
- return TS_SUCCESS;
-
- return TS_ERROR;
-}
-
-TSReturnCode
TSHttpTxnNewCacheLookupDo(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f6165c0/proxy/api/ts/ts.h.in
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in
index c533068..5ba4ebe 100644
--- a/proxy/api/ts/ts.h.in
+++ b/proxy/api/ts/ts.h.in
@@ -3203,7 +3203,6 @@ extern "C"
tsapi TSReturnCode TSHttpTxnCachedRespModifiableGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *offset);
tsapi TSReturnCode TSHttpTxnCacheLookupStatusSet(TSHttpTxn txnp, int cachelookup);
tsapi TSReturnCode TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
- tsapi TSReturnCode TSHttpTxnCachedUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
tsapi TSReturnCode TSHttpTxnPrivateSessionSet(TSHttpTxn txnp, int private_session);
tsapi int TSHttpTxnBackgroundFillStarted(TSHttpTxn txnp);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f6165c0/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index aebdd89..93ce33d 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -4361,10 +4361,7 @@ HttpSM::do_cache_prepare_action(HttpCacheSM * c_sm, CacheHTTPInfo * object_read_
ink_assert(c_sm->cache_write_vc == NULL);
if (t_state.api_lock_url == HttpTransact::LOCK_URL_FIRST) {
- s_url = &(t_state.cache_info.store_url);
- if (s_url->valid()) {
- restore_client_request = true;
- } else if (t_state.redirect_info.redirect_in_process) {
+ if (t_state.redirect_info.redirect_in_process) {
o_url = &(t_state.redirect_info.original_url);
ink_assert(o_url->valid());
restore_client_request = true;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f6165c0/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index b9e557e..fafb927 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -4493,14 +4493,11 @@ HttpTransact::merge_and_update_headers_for_cache_update(State* s)
s->cache_info.object_store.request_set(&s->hdr_info.server_request);
- s_url = &s->cache_info.store_url;
- if (!s_url->valid()) {
- if (s->redirect_info.redirect_in_process)
- s_url = &s->redirect_info.original_url;
- else
- s_url = &s->cache_info.original_url;
- ink_assert(s_url != NULL);
- }
+ if (s->redirect_info.redirect_in_process)
+ s_url = &s->redirect_info.original_url;
+ else
+ s_url = &s->cache_info.original_url;
+ ink_assert(s_url != NULL);
s->cache_info.object_store.request_get()->url_set(s_url->valid()? s_url : s->hdr_info.client_request.url_get());
@@ -4657,9 +4654,7 @@ HttpTransact::set_headers_for_cache_write(State* s, HTTPInfo* cache_info, HTTPHd
// Logic added to restore the orignal URL for multiple cache lookup
// and automatic redirection
- if ((temp_url = &(s->cache_info.store_url))->valid()) {
- request->url_set(temp_url);
- } else if (s->redirect_info.redirect_in_process) {
+ if (s->redirect_info.redirect_in_process) {
temp_url = &s->redirect_info.original_url;
ink_assert(temp_url->valid());
request->url_set(temp_url);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0f6165c0/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 21383fe..2bae65e 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -632,7 +632,6 @@ public:
URL *lookup_url;
URL lookup_url_storage;
URL original_url;
- URL store_url;
HTTPInfo *object_read;
HTTPInfo *second_object_read;
HTTPInfo object_store;
@@ -653,7 +652,6 @@ public:
lookup_url(NULL),
lookup_url_storage(),
original_url(),
- store_url(),
object_read(NULL),
second_object_read(NULL),
object_store(),
@@ -1161,7 +1159,6 @@ public:
hdr_info.cache_response.destroy();
cache_info.lookup_url_storage.destroy();
cache_info.original_url.destroy();
- cache_info.store_url.destroy();
cache_info.object_store.destroy();
cache_info.transform_store.destroy();
redirect_info.original_url.destroy();