From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 25 Jul 2023 06:58:52 +0000 (+0300)
Subject: lib-http: Fix using larger dns ttl/timeout settings than defaults
X-Git-Tag: 2.4.1~1458
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dd1abd87179900e7f8fde8bc56ce439bc100a0b;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: Fix using larger dns ttl/timeout settings than defaults
---

diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c
index 97baf26c86..15da5ccba6 100644
--- a/src/lib-http/http-client.c
+++ b/src/lib-http/http-client.c
@@ -519,9 +519,8 @@ http_client_context_update_settings(struct http_client_context *cctx)
 	/* Revert back to default settings */
 	cctx->dns_client = NULL;
 	cctx->dns_client_socket_path = NULL;
-	cctx->dns_ttl_msecs = HTTP_CLIENT_DEFAULT_DNS_TTL_MSECS;
-	cctx->dns_lookup_timeout_msecs =
-		HTTP_CLIENT_DEFAULT_DNS_LOOKUP_TIMEOUT_MSECS;
+	cctx->dns_ttl_msecs = UINT_MAX;
+	cctx->dns_lookup_timeout_msecs = UINT_MAX;
 
 	/* Override with available client settings */
 	for (client = cctx->clients_list; client != NULL;
@@ -546,6 +545,13 @@ http_client_context_update_settings(struct http_client_context *cctx)
 		debug = debug || client->set.debug;
 	}
 
+	if (cctx->dns_ttl_msecs == UINT_MAX)
+		cctx->dns_ttl_msecs = HTTP_CLIENT_DEFAULT_DNS_TTL_MSECS;
+	if (cctx->dns_lookup_timeout_msecs == UINT_MAX) {
+		cctx->dns_lookup_timeout_msecs =
+			HTTP_CLIENT_DEFAULT_DNS_LOOKUP_TIMEOUT_MSECS;
+	}
+
 	event_set_forced_debug(cctx->event, debug);
 }