[trafficserver] branch master updated: Issue #1359: Flaw in TS-2157 port in server address may be unset

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  0d6dc58   Issue #1359: Flaw in TS-2157 port in server address may be unset
0d6dc58 is described below

commit 0d6dc5811d4a11dad7f6dc01384d48597bb4188b
Author: Susan Hinrichs <sh...@ieee.org>
AuthorDate: Tue Jan 24 01:30:30 2017 +0000

    Issue #1359: Flaw in TS-2157 port in server address may be unset
---
 proxy/http/HttpTransact.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 6113b8b..51db96c 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1712,7 +1712,7 @@ HttpTransact::OSDNSLookup(State *s)
   // If the SRV response has a port number, we should honor it. Otherwise we do the port defined in remap
   if (s->dns_info.srv_lookup_success) {
     s->server_info.dst_addr.port() = htons(s->dns_info.srv_port);
-  } else {
+  } else if (!s->api_server_addr_set) {
     s->server_info.dst_addr.port() = htons(s->hdr_info.client_request.port_get()); // now we can set the port.
   }
   ats_ip_copy(&s->request_data.dest_ip, &s->server_info.dst_addr);

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].