Repository: trafficserver Updated Branches: refs/heads/master 47eeaf34c -> a8d186224
TS-3237: Don't segregate DNS results by port. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a8d18622 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a8d18622 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a8d18622 Branch: refs/heads/master Commit: a8d186224bd5aab95c0d087da251aefb46ba2af9 Parents: 47eeaf3 Author: Alan M. Carroll <[email protected]> Authored: Mon Dec 15 18:40:50 2014 -0600 Committer: Alan M. Carroll <[email protected]> Committed: Mon Dec 15 18:41:01 2014 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ proxy/http/HttpSM.cc | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8d18622/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 88590fb..5f0f372 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.0 + *) [TS-3237] Change HostDB to not segregate DNS results by port. + *) [TS-3226]: Move access of read vio inside the mutex to prevent ntodo corruption *) [TS-3224] fix ts_lua core dump issue. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8d18622/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 5f07f8c..7c13ebb 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -4010,17 +4010,12 @@ HttpSM::do_hostdb_lookup() } else { /* we aren't using SRV stuff... */ DebugSM("http_seq", "[HttpSM::do_hostdb_lookup] Doing DNS Lookup"); - // If there is not a current server, we must be looking up the origin - // server at the beginning of the transaction - int server_port = t_state.current.server ? t_state.current.server->port : t_state.server_info.port; - if (t_state.api_txn_dns_timeout_value != -1) { DebugSM("http_timeout", "beginning DNS lookup. allowing %d mseconds for DNS lookup", t_state.api_txn_dns_timeout_value); } HostDBProcessor::Options opt; - opt.port = server_port; opt.flags = (t_state.cache_info.directives.does_client_permit_dns_storing) ? HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS : HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD
