trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sor...@apache.org
Subject [1/8] trafficserver git commit: TS-3661: keep cache_sm active during 3xx redirect follow to allow for caching the final response
Date Tue, 30 Jun 2015 04:14:56 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/5.3.x 22b6ad89d -> 38b4113f5


TS-3661: keep cache_sm active during 3xx redirect follow to allow
for caching the final response

(cherry picked from commit 5b35808d5a571f3c67ab66c8a06448acda03220a)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5fc9e0b2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5fc9e0b2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5fc9e0b2

Branch: refs/heads/5.3.x
Commit: 5fc9e0b2fccdcf68f8bba7b41a03a16e78222926
Parents: 22b6ad8
Author: Sudheer Vinukonda <sudheerv@yahoo-inc.com>
Authored: Wed Jun 3 23:51:16 2015 +0000
Committer: Phil Sorber <sorber@apache.org>
Committed: Mon Jun 29 10:35:00 2015 -0600

----------------------------------------------------------------------
 proxy/http/HttpSM.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5fc9e0b2/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 32a8a36..048b41d 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1584,7 +1584,6 @@ HttpSM::handle_api_return()
   case HttpTransact::SM_ACTION_REDIRECT_READ: {
     // Clean up from any communication with previous servers
     release_server_session();
-    cache_sm.close_write();
     // tunnel.deallocate_redirect_postdata_buffers();
 
     call_transact_and_set_next_state(HttpTransact::HandleRequest);
@@ -7104,7 +7103,7 @@ HttpSM::set_next_state()
   }
 
   case HttpTransact::SM_ACTION_CACHE_ISSUE_WRITE: {
-    ink_assert(cache_sm.cache_write_vc == NULL);
+    ink_assert((cache_sm.cache_write_vc == NULL) || t_state.redirect_info.redirect_in_process);
     HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_cache_open_write);
 
     do_cache_prepare_write();


Mime
View raw message