Revert apache 5.1 -> 5.2

2 files changed, 3 insertions, 1 deletions

diff --git a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
index aab4bf710c1..48bbffc7e37 100644
--- a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
+++ b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
@@ -36,6 +36,7 @@ import java.util.logging.Logger;
 
 import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.WARNING;
 
 /**
  * @author jonmv
@@ -47,7 +48,6 @@ public abstract class AbstractHttpClient implements HttpClient {
     public static HttpClient wrapping(CloseableHttpClient client) {
         return new AbstractHttpClient() {
             @Override
-            @SuppressWarnings("deprecation")
             protected ClassicHttpResponse execute(ClassicHttpRequest request, HttpClientContext context) throws IOException {
                 return client.execute(request, context);
             }
@@ -121,6 +121,7 @@ public abstract class AbstractHttpClient implements HttpClient {
             Optional<Duration> remaining = builder.deadline.timeLeftOrThrow();
             if (remaining.isPresent()) {
                 config = RequestConfig.copy(config)
+                                      .setConnectTimeout(min(config.getConnectTimeout(), remaining.get()))
                                       .setConnectionRequestTimeout(min(config.getConnectionRequestTimeout(), remaining.get()))
                                       .setResponseTimeout(min(config.getResponseTimeout(), remaining.get()))
                                       .build();
diff --git a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
index 2d1e80101cf..10ef20980e6 100644
--- a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
+++ b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
@@ -38,6 +38,7 @@ public interface HttpClient extends Closeable {
 
     RequestConfig defaultRequestConfig = RequestConfig.custom()
                                                       .setConnectionRequestTimeout(Timeout.ofSeconds(5))
+                                                      .setConnectTimeout(Timeout.ofSeconds(5))
                                                       .setRedirectsEnabled(false)
                                                       .build();