Repository: trafficserver Updated Branches: refs/heads/master 6dfc13123 -> 912d5f2f8
TS-2613: Can't turn on attach server session to client from records.config Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/912d5f2f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/912d5f2f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/912d5f2f Branch: refs/heads/master Commit: 912d5f2f8946da00c70d11e53a42f2d75a6ead57 Parents: 6dfc131 Author: Bryan Call <[email protected]> Authored: Tue Mar 4 11:06:33 2014 +0000 Committer: Bryan Call <[email protected]> Committed: Tue Mar 4 11:06:33 2014 +0000 ---------------------------------------------------------------------- CHANGES | 2 ++ proxy/http/HttpConfig.cc | 1 + proxy/http/HttpSM.cc | 1 + 3 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/912d5f2f/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 16f1fab..2b3627c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2613] Can't turn on attach server session to client from records.config + *) [TS-2611] Add a new S3 authentication plugin, s3_auth. This only supports the v2 features of the S3 API. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/912d5f2f/proxy/http/HttpConfig.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc index 5ecbfca..2c33894 100644 --- a/proxy/http/HttpConfig.cc +++ b/proxy/http/HttpConfig.cc @@ -1531,6 +1531,7 @@ HttpConfig::reconfigure() params->oride.server_tcp_init_cwnd = m_master.oride.server_tcp_init_cwnd; params->oride.origin_max_connections = m_master.oride.origin_max_connections; params->origin_min_keep_alive_connections = m_master.origin_min_keep_alive_connections; + params->attach_server_session_to_client = m_master.attach_server_session_to_client; if (params->oride.origin_max_connections && params->oride.origin_max_connections < params->origin_min_keep_alive_connections ) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/912d5f2f/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 04ad91b..d5ecf54 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -2953,6 +2953,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer * p) // origin server if (t_state.http_config_param->attach_server_session_to_client == 1 && ua_session && t_state.client_info.keep_alive == HTTP_KEEPALIVE) { + Debug("http", "attaching server session to the client"); ua_session->attach_server_session(server_session); } else { // Release the session back into the shared session pool
