Merge 3.6 (issue #28089)

2016-12-12 16:45:21 -05:00 · 2016-12-12 16:45:21 -05:00 · 8bf85b692b
parent 21e033466b 3432f2f47c
commit 8bf85b692b
2 changed files with 6 additions and 0 deletions
--- 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
 -------------
--- 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
 --------