From c451eee406ac520488a281bf97ac0e1d37716b1c Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 2 Feb 2025 15:58:59 +0100
Subject: [PATCH] fix(deps): update dependency
 org.apache.httpcomponents.client5:httpclient5 to v5.4.2

remove workaround that is no longer needed
---
 commafeed-server/pom.xml                       |  2 +-
 .../java/com/commafeed/backend/HttpGetter.java | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml
index 5eb0bdf3..08da91a9 100644
--- a/commafeed-server/pom.xml
+++ b/commafeed-server/pom.xml
@@ -453,7 +453,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.4.1</version>
+			<version>5.4.2</version>
 		</dependency>
 		<!-- add brotli support for httpclient5 -->
 		<dependency>
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java
index 1b4ccb88..1339125d 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java
@@ -2,10 +2,7 @@ package com.commafeed.backend;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.IDN;
-import java.net.InetAddress;
 import java.net.URI;
-import java.net.UnknownHostException;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.InstantSource;
@@ -16,8 +13,6 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hc.client5.http.DnsResolver;
-import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.config.TlsConfig;
@@ -249,7 +244,6 @@ public class HttpGetter {
 				.setDefaultTlsConfig(TlsConfig.custom().setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout())).build())
 				.setMaxConnPerRoute(poolSize)
 				.setMaxConnTotal(poolSize)
-				.setDnsResolver(new InternationalizedDomainNameToAsciiDnsResolver(SystemDefaultDnsResolver.INSTANCE))
 				.build();
 
 	}
@@ -286,18 +280,6 @@ public class HttpGetter {
 				.build();
 	}
 
-	private record InternationalizedDomainNameToAsciiDnsResolver(DnsResolver delegate) implements DnsResolver {
-		@Override
-		public InetAddress[] resolve(String host) throws UnknownHostException {
-			return delegate.resolve(IDN.toASCII(host));
-		}
-
-		@Override
-		public String resolveCanonicalHostname(String host) throws UnknownHostException {
-			return delegate.resolveCanonicalHostname(IDN.toASCII(host));
-		}
-	}
-
 	@Getter
 	public static class NotModifiedException extends Exception {
 		private static final long serialVersionUID = 1L;