From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 21 Jan 2018 15:00:31 +0000 (+0100)
Subject: lib-http: client: Use the new  http_url_get_port*() functions.
X-Git-Tag: 2.3.1~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba02f29f9c1f6383ad9d4d730ff2fc0cb2923933;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: client: Use the new  http_url_get_port*() functions.
---

diff --git a/src/lib-http/http-client-request.c b/src/lib-http/http-client-request.c
index 5d12715498..e0f9f89718 100644
--- a/src/lib-http/http-client-request.c
+++ b/src/lib-http/http-client-request.c
@@ -852,7 +852,7 @@ http_client_request_get_peer_addr(const struct http_client_request *req,
 		addr->type = HTTP_CLIENT_PEER_ADDR_RAW;
 		addr->a.tcp.ip = host_url->host.ip;
 		addr->a.tcp.port =
-			(host_url->port != 0 ? host_url->port : HTTPS_DEFAULT_PORT);
+			http_url_get_port_default(host_url, HTTPS_DEFAULT_PORT);
 	} else if (host_url->have_ssl) {
 		if (req->ssl_tunnel)
 			addr->type = HTTP_CLIENT_PEER_ADDR_HTTPS_TUNNEL;
@@ -860,13 +860,11 @@ http_client_request_get_peer_addr(const struct http_client_request *req,
 			addr->type = HTTP_CLIENT_PEER_ADDR_HTTPS;
 		addr->a.tcp.ip = host_url->host.ip;
 		addr->a.tcp.https_name = host_url->host.name;
- 		addr->a.tcp.port =
-			(host_url->port != 0 ? host_url->port : HTTPS_DEFAULT_PORT);
+		addr->a.tcp.port = http_url_get_port(host_url);
 	} else {
 		addr->type = HTTP_CLIENT_PEER_ADDR_HTTP;
 		addr->a.tcp.ip = host_url->host.ip;
-		addr->a.tcp.port =
-			(host_url->port != 0 ? host_url->port : HTTP_DEFAULT_PORT);
+		addr->a.tcp.port = http_url_get_port(host_url);
 	}
 }