Repository: trafficserver Updated Branches: refs/heads/ts-974-multi-range-read [created] 2ddfc7ab5
First pass on removing range processing from HttpSM. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ae369eea Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ae369eea Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ae369eea Branch: refs/heads/ts-974-multi-range-read Commit: ae369eeade78ed9a80c80ead6d9a6aa4775ce48d Parents: d33b625 Author: Alan M. Carroll <solidwallofc...@yahoo-inc.com> Authored: Tue Dec 2 10:54:44 2014 -0600 Committer: Alan M. Carroll <solidwallofc...@yahoo-inc.com> Committed: Sat Dec 6 11:56:03 2014 -0600 ---------------------------------------------------------------------- proxy/http/HttpSM.cc | 4 ++++ proxy/http/HttpTransact.cc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae369eea/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 5f07f8c..d1edc50 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -4351,6 +4351,9 @@ HttpSM::do_range_parse(MIMEField *range_field) void HttpSM::do_range_setup_if_necessary() { +# if 1 + t_state.range_setup = HttpTransact::RANGE_NONE; +# else MIMEField *field; INKVConnInternal *range_trans; int field_content_type_len = -1; @@ -4393,6 +4396,7 @@ HttpSM::do_range_setup_if_necessary() } } } +# endif } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae369eea/proxy/http/HttpTransact.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index fe65f81..c348c29a 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -2811,7 +2811,7 @@ HttpTransact::build_response_from_cache(State* s, HTTPWarningCode warning_code) // send back the full document to the client. DebugTxn("http_trans", "[build_response_from_cache] Match! Serving full document."); s->cache_info.action = CACHE_DO_SERVE; - +# if 0 // Check if cached response supports Range. If it does, append // Range transformation plugin // only if the cached response is a 200 OK @@ -2845,6 +2845,10 @@ HttpTransact::build_response_from_cache(State* s, HTTPWarningCode warning_code) build_response(s, cached_response, &s->hdr_info.client_response, s->client_info.http_version); } s->next_action = SM_ACTION_SERVE_FROM_CACHE; +# else + build_response(s, cached_response, &s->hdr_info.client_response, s->client_info.http_version); + s->next_action = SM_ACTION_SERVE_FROM_CACHE; +# endif } // If the client request is a HEAD, then serve the header from cache. else if (s->method == HTTP_WKSIDX_HEAD) {
