mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

bpo-34932: Add socket.TCP_KEEPALIVE for macOS (GH-25079)

Browse source 
(cherry picked from commit d59d7374a3)

Co-authored-by: Shane Harvey <shnhrv@gmail.com>
This commit is contained in:
Miss Islington (bot) 2021-07-14 16:15:31 -07:00 • committed by GitHub
parent 02e4c0cad3
commit ff7af2203c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/socket.rst
View file

@ -381,6 +381,8 @@ Constants
.. versionchanged:: 3.10 .. versionchanged:: 3.10
``IP_RECVTOS`` was added. ``IP_RECVTOS`` was added.
Added ``TCP_KEEPALIVE``. On MacOS this constant can be used in the same
way that ``TCP_KEEPIDLE`` is used on Linux.
.. data:: AF_CAN .. data:: AF_CAN
PF_CAN PF_CAN

7
Lib/test/test_socket.py
View file

@ -6411,6 +6411,12 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
sock.bind(("type", "n" * 64)) sock.bind(("type", "n" * 64))
@unittest.skipUnless(sys.platform == 'darwin', 'macOS specific test')
class TestMacOSTCPFlags(unittest.TestCase):
def test_tcp_keepalive(self):
self.assertTrue(socket.TCP_KEEPALIVE)
@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows") @unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
class TestMSWindowsTCPFlags(unittest.TestCase): class TestMSWindowsTCPFlags(unittest.TestCase):
knownTCPFlags = { knownTCPFlags = {
@ -6669,6 +6675,7 @@ def test_main():
SendfileUsingSendfileTest, SendfileUsingSendfileTest,
]) ])
tests.append(TestMSWindowsTCPFlags) tests.append(TestMSWindowsTCPFlags)
tests.append(TestMacOSTCPFlags)
thread_info = threading_helper.threading_setup() thread_info = threading_helper.threading_setup()
support.run_unittest(*tests) support.run_unittest(*tests)

1
Misc/NEWS.d/next/macOS/2021-03-29-21-11-23.bpo-34932.f3Hdyd.rst Normal file
View file

@ -0,0 +1 @@
Add socket.TCP_KEEPALIVE support for macOS. Patch by Shane Harvey.

4
Modules/socketmodule.c
View file

@ -8158,6 +8158,10 @@ PyInit__socket(void)
#endif #endif
#ifdef TCP_KEEPIDLE #ifdef TCP_KEEPIDLE
PyModule_AddIntMacro(m, TCP_KEEPIDLE); PyModule_AddIntMacro(m, TCP_KEEPIDLE);
#endif
/* TCP_KEEPALIVE is OSX's TCP_KEEPIDLE equivalent */
#if defined(__APPLE__) && defined(TCP_KEEPALIVE)
PyModule_AddIntMacro(m, TCP_KEEPALIVE);
#endif #endif
#ifdef TCP_KEEPINTVL #ifdef TCP_KEEPINTVL
PyModule_AddIntMacro(m, TCP_KEEPINTVL); PyModule_AddIntMacro(m, TCP_KEEPINTVL);