commit 5bdcb242f0297c9dca8f6284ed5a4dd062a210b7
author Carter Kozak <ckozak@ckozak.net> Sat Jul 11 11:18:42 2020 -0400
committer GitHub <noreply@github.com> Sat Jul 11 17:18:42 2020 +0200
tree 47a0c21830abcf9ac2d049033326c0f435ac6777
parent a0a2ae05597e9ed146774f3746b5fb1be99cea03

HTTPCLIENT-2099, HTTPCLIENT-2091: SSLConnectionSocketFactory connect timeout fix (#241)

SSLConnectionSocketFactory no longer overrides the socket timeout
with the connect timeout when an unlimited socket timeout is
configured. This matches behavior of HTTPCLIENT-2091.

Note that in scenarios where SocketConfig sets an infinite timeout
and the RequestConfig sets a bounded timeout, this change results
in the connect-timeout no longer applying to the TLS handshake.
This behavior can be retained by setting the expected timeout in
the SocketConfig.

httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
index 60ce267..87db974 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
@@ -207,9 +207,6 @@
             sock.bind(localAddress);
         }
         try {
-            if (TimeValue.isPositive(connectTimeout) && sock.getSoTimeout() == 0) {
-                sock.setSoTimeout(connectTimeout.toMillisecondsIntBound());
-            }
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Connecting socket to {} with timeout {}", remoteAddress, connectTimeout);
             }