This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4750af1af3 Fix logic around srv records at other code path (#11193)
4750af1af3 is described below
commit 4750af1af3490b355c696da73e670e2235a5d9c6
Author: Chris McFarlen <ch...@mcfarlen.us>
AuthorDate: Mon Apr 1 13:40:46 2024 -0500
Fix logic around srv records at other code path (#11193)
Co-authored-by: Chris McFarlen <cmcfar...@apple.com>
---
src/proxy/http/HttpSM.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/proxy/http/HttpSM.cc b/src/proxy/http/HttpSM.cc
index 4be8d85bf3..eee135e65d 100644
--- a/src/proxy/http/HttpSM.cc
+++ b/src/proxy/http/HttpSM.cc
@@ -4431,8 +4431,8 @@ HttpSM::do_hostdb_lookup()
}
pending_action = hostDBProcessor.getSRVbyname_imm(this,
(cb_process_result_pfn)&HttpSM::process_srv_info, d, 0, opt);
if (pending_action.empty()) {
- char const *host_name = t_state.dns_info.resolved_p ?
t_state.dns_info.srv_hostname : t_state.dns_info.lookup_name;
- opt.port = t_state.dns_info.resolved_p ?
t_state.dns_info.srv_port :
+ char const *host_name = t_state.dns_info.is_srv() ?
t_state.dns_info.srv_hostname : t_state.dns_info.lookup_name;
+ opt.port = t_state.dns_info.is_srv() ?
t_state.dns_info.srv_port :
t_state.server_info.dst_addr.isValid() ?
t_state.server_info.dst_addr.host_order_port() :
t_state.hdr_info.client_request.port_get();
opt.flags =
(t_state.cache_info.directives.does_client_permit_dns_storing) ?
HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS :
