summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2016-12-12 21:45:21 (GMT)
committerYury Selivanov <yury@magic.io>2016-12-12 21:45:21 (GMT)
commit8bf85b692b8abf5c312c728436b9eea50c6cf682 (patch)
tree62bd80848a328ac04bbd1dcfd7374e6fcf50680f
parent21e033466ba4712e0b1ade5b5756a1e8ad3dcdac (diff)
parent3432f2f47c1d3d2e97f13d58aef1bc5a72a8976c (diff)
downloadcpython-8bf85b692b8abf5c312c728436b9eea50c6cf682.zip
cpython-8bf85b692b8abf5c312c728436b9eea50c6cf682.tar.gz
cpython-8bf85b692b8abf5c312c728436b9eea50c6cf682.tar.bz2
Merge 3.6 (issue #28089)
-rw-r--r--Doc/library/asyncio-protocol.rst3
-rw-r--r--Doc/whatsnew/3.6.rst3
2 files changed, 6 insertions, 0 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
index c0342f7..3fbf510 100644
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -25,6 +25,9 @@ the transport's kind.
The transport classes are :ref:`not thread safe <asyncio-multithreading>`.
+.. versionchanged:: 3.6
+ The socket option ``TCP_NODELAY`` is now set by default.
+
BaseTransport
-------------
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index ddca2ef..0187f94 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -875,6 +875,9 @@ Notable changes in the :mod:`asyncio` module since Python 3.5.0
but that use asyncio to handle them.
(Contributed by Jim Fulton in :issue:`27392`.)
+* ``TCP_NODELAY`` flag is now set for all TCP transports by default.
+ (Contributed by Yury Selivanov in :issue:`27456`.)
+
binascii
--------