changeset:   105390:6d69da76be6a
branch:      3.6
parent:      105387:6b8f7d1e2ba4
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue Nov 29 16:55:04 2016 +0100
files:       Misc/NEWS Modules/socketmodule.c
description:
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.


diff -r 6b8f7d1e2ba4 -r 6d69da76be6a Misc/NEWS
--- a/Misc/NEWS	Tue Nov 29 09:54:17 2016 +0200
+++ b/Misc/NEWS	Tue Nov 29 16:55:04 2016 +0100
@@ -74,6 +74,10 @@
 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 -r 6b8f7d1e2ba4 -r 6d69da76be6a Modules/socketmodule.c
--- a/Modules/socketmodule.c	Tue Nov 29 09:54:17 2016 +0200
+++ b/Modules/socketmodule.c	Tue Nov 29 16:55:04 2016 +0100
@@ -7512,6 +7512,12 @@
 #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