You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/06/04 01:53:37 UTC

[1/2] trafficserver git commit: [TS-3661]: keep cache_sm active during 3xx redirect follow to allow for caching the final response

Repository: trafficserver
Updated Branches:
  refs/heads/master da03d7c12 -> 2d8113098


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


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

Branch: refs/heads/master
Commit: 5b35808d5a571f3c67ab66c8a06448acda03220a
Parents: da03d7c
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Wed Jun 3 23:51:16 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Wed Jun 3 23:51:16 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5b35808d/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 0ed6640..a0ed48c 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1544,7 +1544,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);
@@ -7081,7 +7080,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();


[2/2] trafficserver git commit: [TS-3661]: update CHANGES

Posted by su...@apache.org.
[TS-3661]: update CHANGES


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

Branch: refs/heads/master
Commit: 2d8113098a44d764378e8e0a5d8a5c03f9f2788d
Parents: 5b35808
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Wed Jun 3 23:53:16 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Wed Jun 3 23:53:16 2015 +0000

----------------------------------------------------------------------
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2d811309/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index bb2fe45..9a37779 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
+  *) [TS-3661] keep cache_sm active during 3xx redirect follow to allow
+     for caching the final response.
+
   *) [TS-3158] Convert traffic_manager to use standard argument processing.
 
   *) [TS-3655] Forget to close netvc in regression test.