Repository: trafficserver Updated Branches: refs/heads/master 813bffc0a -> 23fab5495
TS-3129: Parent proxy configuration does not work for incoming HTTPS requests Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/23fab549 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/23fab549 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/23fab549 Branch: refs/heads/master Commit: 23fab54950a96c0af105ec0af9266f7065003577 Parents: 813bffc Author: Bryan Call <[email protected]> Authored: Tue Oct 14 19:11:16 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Tue Oct 14 19:11:16 2014 -0700 ---------------------------------------------------------------------- proxy/http/HttpTransact.cc | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23fab549/proxy/http/HttpTransact.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index 112f247..e0d0df1 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -283,7 +283,6 @@ is_negative_caching_appropriate(HttpTransact::State* s) inline static HttpTransact::LookingUp_t find_server_and_update_current_info(HttpTransact::State* s) { - URL *url = s->hdr_info.client_request.url_get(); int host_len; const char *host = s->hdr_info.client_request.host_get(&host_len); @@ -292,9 +291,6 @@ find_server_and_update_current_info(HttpTransact::State* s) // I just wanted to do this for cop heartbeats, someone else // wanted it for all requests to local_host. s->parent_result.r = PARENT_DIRECT; - } else if (url->scheme_get_wksidx() == URL_WKSIDX_HTTPS) { - // Do not forward HTTPS requests onto a parent. - s->parent_result.r = PARENT_DIRECT; } else if (s->method == HTTP_WKSIDX_CONNECT && s->http_config_param->disable_ssl_parenting) { s->parent_result.r = PARENT_DIRECT; } else if (s->http_config_param->uncacheable_requests_bypass_parent &&
