You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by us...@apache.org on 2015/06/19 02:09:33 UTC
trafficserver git commit: TS-3708 Call SEND_RESP_HDRS hookpoint
before sending CONNECT response to client
Repository: trafficserver
Updated Branches:
refs/heads/master 83d9826d8 -> ede9130de
TS-3708 Call SEND_RESP_HDRS hookpoint before sending CONNECT response to client
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ede9130d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ede9130d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ede9130d
Branch: refs/heads/master
Commit: ede9130de6592f1d89201d8ca84d852258aae70f
Parents: 83d9826
Author: Uri Shachar <us...@apache.org>
Authored: Fri Jun 19 02:43:24 2015 +0300
Committer: Uri Shachar <us...@apache.org>
Committed: Fri Jun 19 02:43:24 2015 +0300
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/http/HttpSM.cc | 8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ede9130d/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0e92aab..a6b8940 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3708] Call SEND_RESP_HDRS hookpoint for CONNECT responses.
+
*) [TS-3488] Change some network defines to librecords configurations. We
also tune some of them back, to avoid the < 10ms spin issues (but this can
be changed now in records.config).
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ede9130d/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 33e9d73..6bbacbe 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1548,7 +1548,10 @@ HttpSM::handle_api_return()
call_transact_and_set_next_state(HttpTransact::HandleRequest);
break;
}
-
+ case HttpTransact::SM_ACTION_SSL_TUNNEL: {
+ setup_blind_tunnel(true);
+ break;
+ }
default: {
ink_release_assert(!"Should not get here");
}
@@ -7142,7 +7145,8 @@ HttpSM::set_next_state()
}
case HttpTransact::SM_ACTION_SSL_TUNNEL: {
- setup_blind_tunnel(true);
+ t_state.api_next_action = HttpTransact::SM_ACTION_API_SEND_RESPONSE_HDR;
+ do_api_callout();
break;
}