commit e0ee2c7514b812b5a18bfe9aab9594c5879dc34f
author Nick Withers <nwithers@sypaq.com.au> Wed Aug 31 16:22:27 2022 +1000
committer Jens Geyer <Jens-G@users.noreply.github.com> Fri Sep 02 22:40:13 2022 +0200
tree 120e01b66d1d0a82755dfedf150d9b721d5663cc
parent ec5e17714a1f9da34173749fc01eea33c7f6af62

THRIFT-5617: T(SSL)Socket TCP keep-alive incorrectly applies SO_KEEPALIVE to IPPROTO_TCP

Apply socket.SO_KEEPALIVE at the socket.SOL_SOCKET, not socket.IPPROTO_TCP, level

lib/py/src/transport/TSocket.py

diff --git a/lib/py/src/transport/TSocket.py b/lib/py/src/transport/TSocket.py
index eea5366..ee7b26d 100644
--- a/lib/py/src/transport/TSocket.py
+++ b/lib/py/src/transport/TSocket.py
@@ -131,9 +131,9 @@
         for family, socktype, _, _, sockaddr in addrs:
             handle = self._do_open(family, socktype)
 
-            # TCP_KEEPALIVE
+            # TCP keep-alive
             if self._socket_keepalive:
-                handle.setsockopt(socket.IPPROTO_TCP, socket.SO_KEEPALIVE, 1)
+                handle.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
 
             handle.settimeout(self._timeout)
             try: