summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-12-13 03:24:47 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-12-13 03:24:47 (GMT)
commit57b667261ca9a3834ae68e0398b1d4cea3d61308 (patch)
treea59c21ca3201047543b867f33ca74dcde244d2d3
parentb92c40ef9b7ce7b12d88bbb6531fa6870444f704 (diff)
downloadcpython-57b667261ca9a3834ae68e0398b1d4cea3d61308.zip
cpython-57b667261ca9a3834ae68e0398b1d4cea3d61308.tar.gz
cpython-57b667261ca9a3834ae68e0398b1d4cea3d61308.tar.bz2
expose TCP_FASTOPEN and MSG_FASTOPEN
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/socketmodule.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a9c00d..93bb7c6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -163,6 +163,9 @@ Core and Builtins
Library
-------
+- Expose the TCP_FASTOPEN and MSG_FASTOPEN flags in socket when they're
+ available.
+
- Issue #15701: Add a .headers attribute to urllib.error.HTTPError. Patch
contributed by Berker Peksag.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 1c3396f..99c07cb 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5971,6 +5971,9 @@ PyInit__socket(void)
#ifdef MSG_MCAST
PyModule_AddIntConstant(m, "MSG_MCAST", MSG_MCAST);
#endif
+#ifdef MSG_FASTOPEN
+ PyModule_AddIntConstant(m, "MSG_FASTOPEN", MSG_FASTOPEN);
+#endif
/* Protocol level and numbers, usable for [gs]etsockopt */
#ifdef SOL_SOCKET
@@ -6401,7 +6404,9 @@ PyInit__socket(void)
#ifdef TCP_QUICKACK
PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
#endif
-
+#ifdef TCP_FASTOPEN
+ PyModule_AddIntConstant(m, "TCP_FASTOPEN", TCP_FASTOPEN);
+#endif
/* IPX options */
#ifdef IPX_TYPE