HTTPCLIENT-2384: Socket options related to TcpKeepAlive are ignored

Author: ok2c

httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java

@@ -32,7 +32,6 @@
 import java.net.Proxy;
 import java.net.Socket;
 import java.net.SocketAddress;
-import java.net.SocketException;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -59,6 +58,7 @@
 import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.io.Closer;
+import org.apache.hc.core5.io.SocketSupport;
 import org.apache.hc.core5.net.NamedEndpoint;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.TimeValue;
@@ -299,7 +299,7 @@ private void connectToUnixDomainSocket(
     }
 
     private static void configureSocket(final Socket socket, final SocketConfig socketConfig,
-                                        final Timeout soTimeout) throws SocketException {
+                                        final Timeout soTimeout) throws IOException {
         if (soTimeout != null) {
             socket.setSoTimeout(soTimeout.toMillisecondsIntBound());
         }
@@ -317,6 +317,15 @@ private static void configureSocket(final Socket socket, final SocketConfig sock
         if (linger >= 0) {
             socket.setSoLinger(true, linger);
         }
+        if (socketConfig.getTcpKeepIdle() > 0) {
+            SocketSupport.setOption(socket, SocketSupport.TCP_KEEPIDLE, socketConfig.getTcpKeepIdle());
+        }
+        if (socketConfig.getTcpKeepInterval() > 0) {
+            SocketSupport.setOption(socket, SocketSupport.TCP_KEEPINTERVAL, socketConfig.getTcpKeepInterval());
+        }
+        if (socketConfig.getTcpKeepCount() > 0) {
+            SocketSupport.setOption(socket, SocketSupport.TCP_KEEPCOUNT, socketConfig.getTcpKeepCount());
+        }
     }
 
     @Override