This is an automated email from the ASF dual-hosted git repository. sorber pushed a commit to branch 6.2.x in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 751c3da7e00762cc8f1c7c4dc712cd105c22667e Author: James Peach <jpe...@apache.org> AuthorDate: Wed Apr 27 11:20:25 2016 -0700 TS-4388: Remove unused HttpConfig::parent_proxy_routing_enable. (cherry picked from commit 0689f632cb40922b0c1aa5589f83059838d37047) Conflicts: proxy/http/HttpConfig.h --- proxy/http/HttpConfig.cc | 3 --- proxy/http/HttpConfig.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc index 4d6a2c6..3cf91ee 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"); @@ -1169,7 +1167,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 1860550..8e2b66f 100644 --- a/proxy/http/HttpConfig.h +++ b/proxy/http/HttpConfig.h @@ -706,7 +706,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; @@ -922,11 +921,9 @@ inline HttpConfigParams::HttpConfigParams() 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), -- To stop receiving notification emails like this one, please contact "commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.