summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-11-29 16:55:04 +0100
committerVictor Stinner <victor.stinner@gmail.com>2016-11-29 16:55:04 +0100
commit11dd6048aa3dc94e9b709f638301b0ccfcd4b9ee (patch)
tree13b568a550d13139fe5733f61c6b649cb275cd72
parent9ec07721f459d14131d6453ccb6d2a1a0b0c1959 (diff)
downloadcpython-git-11dd6048aa3dc94e9b709f638301b0ccfcd4b9ee.tar.gz
Add TCP_CONGESTION and TCP_USER_TIMEOUT
Issue #26273: Add new socket.TCP_CONGESTION (Linux 2.6.13) and socket.TCP_USER_TIMEOUT (Linux 2.6.37) constants. Patch written by Omar Sandoval.
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/socketmodule.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 35777356e0..50a446ad9d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -74,6 +74,10 @@ Core and Builtins
Library
-------
+- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and
+ :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by
+ Omar Sandoval.
+
- Issue #28752: Restored the __reduce__() methods of datetime objects.
- Issue #28727: Regular expression patterns, _sre.SRE_Pattern objects created
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 4c1d8f0034..f4edc062fd 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -7512,6 +7512,12 @@ PyInit__socket(void)
#ifdef TCP_FASTOPEN
PyModule_AddIntMacro(m, TCP_FASTOPEN);
#endif
+#ifdef TCP_CONGESTION
+ PyModule_AddIntMacro(m, TCP_CONGESTION);
+#endif
+#ifdef TCP_USER_TIMEOUT
+ PyModule_AddIntMacro(m, TCP_USER_TIMEOUT);
+#endif
/* IPX options */
#ifdef IPX_TYPE