Updated Branches: refs/heads/master 0896acc5f -> ed0e0badf
Back out the API from TS-998 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ed0e0bad Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ed0e0bad Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ed0e0bad Branch: refs/heads/master Commit: ed0e0badf9562a8bd2bce5215c1eda7fdfe2b2cf Parents: 0896acc Author: Leif Hedstrom <[email protected]> Authored: Thu Aug 23 11:04:23 2012 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Aug 23 11:04:23 2012 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ proxy/InkAPI.cc | 14 -------------- proxy/api/ts/ts.h.in | 3 +-- proxy/hdrs/HTTP.cc | 7 ------- proxy/hdrs/URL.h | 4 ---- 5 files changed, 3 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed0e0bad/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 62fc68f..5de6aea 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.0 + *) Removed the (experiemental) TSHttpTxnClientDataGet() API. See + TS-998 for more details. *) [TS-1408] Plugin to implement the stale-while-revalidate and stale-if-error features of RFC5861 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed0e0bad/proxy/InkAPI.cc ---------------------------------------------------------------------- diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc index b5e373a..10badab 100644 --- a/proxy/InkAPI.cc +++ b/proxy/InkAPI.cc @@ -4552,20 +4552,6 @@ TSHttpTxnClientKeepaliveSet(TSHttpTxn txnp, int set) s->hdr_info.trust_response_cl = (set != 0) ? true : false; } -TSReturnCode -TSHttpTxnClientDataGet(TSHttpTxn txnp, const char **bufp, int *len) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - - HttpSM *sm = (HttpSM *) txnp; - HTTPHdr *hptr = &(sm->t_state.hdr_info.client_request); - if (hptr->valid()) { - *bufp = hptr->m_url_cached.m_url_impl->the_request; - *len = hptr->m_url_cached.m_url_impl->the_request_len; - return TS_SUCCESS; - } - return TS_ERROR; -} TSReturnCode TSHttpTxnClientReqGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed0e0bad/proxy/api/ts/ts.h.in ---------------------------------------------------------------------- diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in index afa4f35..45a113b 100644 --- a/proxy/api/ts/ts.h.in +++ b/proxy/api/ts/ts.h.in @@ -2213,8 +2213,7 @@ extern "C" tsapi TSHttpSsn TSHttpTxnSsnGet(TSHttpTxn txnp); tsapi TSReturnCode TSHttpTxnClientReqGet(TSHttpTxn txnp, TSMBuffer* bufp, TSMLoc* offset); tsapi TSReturnCode TSHttpTxnPristineUrlGet(TSHttpTxn txnp, TSMBuffer* bufp, TSMLoc* url_loc); - /* Get the request headers as sent by the Client */ - tsapi TSReturnCode TSHttpTxnClientDataGet(TSHttpTxn txnp, const char **bufp, int *len); + /** Get the effective URL for the transaction. The effective URL is the URL taking in to account both the explicit URL in the request and the HOST field. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed0e0bad/proxy/hdrs/HTTP.cc ---------------------------------------------------------------------- diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc index eeec4e3..c3d90ad 100644 --- a/proxy/hdrs/HTTP.cc +++ b/proxy/hdrs/HTTP.cc @@ -918,13 +918,6 @@ http_parser_parse_req(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const must_copy_strings = (must_copy_strings || (!line_is_real)); -#if ENABLE_SAVE_ORIGINAL_REQUEST - mime_str_u16_set(heap, line_start, strlen(line_start), - &(hh->u.req.m_url_impl->the_request), - &(hh->u.req.m_url_impl->the_request_len), - must_copy_strings); -#endif - #if (ENABLE_PARSER_FAST_PATHS) // first try fast path if (end - cur >= 16) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed0e0bad/proxy/hdrs/URL.h ---------------------------------------------------------------------- diff --git a/proxy/hdrs/URL.h b/proxy/hdrs/URL.h index a7cf1e3..8f41e69 100644 --- a/proxy/hdrs/URL.h +++ b/proxy/hdrs/URL.h @@ -83,10 +83,6 @@ struct URLImpl:public HdrHeapObjImpl // Sanity Check Functions void check_strings(HeapCheck *heaps, int num_heaps); - - // The original (unparsed) request - const char *the_request; - uint16_t the_request_len; };
