This is an automated email from the ASF dual-hosted git repository. jpeach pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 0689f632cb40922b0c1aa5589f83059838d37047 Author: James Peach <[email protected]> AuthorDate: Wed Apr 27 11:20:25 2016 -0700 TS-4388: Remove unused HttpConfig::parent_proxy_routing_enable. --- proxy/http/HttpConfig.cc | 3 --- proxy/http/HttpConfig.h | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc index 885ff3c..d40f9e9 100644 --- a/proxy/http/HttpConfig.cc +++ b/proxy/http/HttpConfig.cc @@ -888,8 +888,6 @@ HttpConfig::startup() HttpEstablishStaticConfigLongLong(c.origin_min_keep_alive_connections, "proxy.config.http.origin_min_keep_alive_connections"); HttpEstablishStaticConfigLongLong(c.oride.attach_server_session_to_client, "proxy.config.http.attach_server_session_to_client"); - HttpEstablishStaticConfigByte(c.parent_proxy_routing_enable, "proxy.config.http.parent_proxy_routing_enable"); - // Wank me. HttpEstablishStaticConfigByte(c.disable_ssl_parenting, "proxy.local.http.parent_proxy.disable_connect_tunneling"); HttpEstablishStaticConfigByte(c.no_dns_forward_to_parent, "proxy.config.http.no_dns_just_forward_to_parent"); @@ -1173,7 +1171,6 @@ HttpConfig::reconfigure() params->origin_min_keep_alive_connections = params->oride.origin_max_connections; } - params->parent_proxy_routing_enable = INT_TO_BOOL(m_master.parent_proxy_routing_enable); params->enable_url_expandomatic = INT_TO_BOOL(m_master.enable_url_expandomatic); params->oride.insert_request_via_string = m_master.oride.insert_request_via_string; diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h index 17d327a..ef3c608 100644 --- a/proxy/http/HttpConfig.h +++ b/proxy/http/HttpConfig.h @@ -638,7 +638,6 @@ public: MgmtInt origin_min_keep_alive_connections; // TODO: This one really ought to be overridable, but difficult right now. MgmtInt max_websocket_connections; - MgmtByte parent_proxy_routing_enable; MgmtByte disable_ssl_parenting; MgmtByte enable_url_expandomatic; @@ -852,9 +851,9 @@ extern volatile int32_t icp_dynamic_enabled; ///////////////////////////////////////////////////////////// inline HttpConfigParams::HttpConfigParams() : proxy_hostname(NULL), proxy_hostname_len(0), server_max_connections(0), origin_min_keep_alive_connections(0), - max_websocket_connections(-1), parent_proxy_routing_enable(0), disable_ssl_parenting(0), enable_url_expandomatic(0), - no_dns_forward_to_parent(0), uncacheable_requests_bypass_parent(1), no_origin_server_dns(0), use_client_target_addr(0), - use_client_source_port(0), proxy_request_via_string(NULL), proxy_request_via_string_len(0), proxy_response_via_string(NULL), + max_websocket_connections(-1), disable_ssl_parenting(0), enable_url_expandomatic(0), no_dns_forward_to_parent(0), + uncacheable_requests_bypass_parent(1), no_origin_server_dns(0), use_client_target_addr(0), use_client_source_port(0), + proxy_request_via_string(NULL), proxy_request_via_string_len(0), proxy_response_via_string(NULL), proxy_response_via_string_len(0), url_expansions_string(NULL), url_expansions(NULL), num_url_expansions(0), session_auth_cache_keep_alive_enabled(1), transaction_active_timeout_in(900), accept_no_activity_timeout(120), parent_connect_attempts(4), per_parent_connect_attempts(2), parent_connect_timeout(30), anonymize_other_header_list(NULL), -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
