summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2017-06-11 18:53:14 (GMT)
committerGitHub <noreply@github.com>2017-06-11 18:53:14 (GMT)
commit2737291134d398da9e5b932b0309a6d9d343cb5a (patch)
treea437b2b28abcb2afba89438983b231f2e5d1fb89 /Doc
parent57d8de80313c536d409d6a104ae577af8ffc57fb (diff)
downloadcpython-2737291134d398da9e5b932b0309a6d9d343cb5a.zip
cpython-2737291134d398da9e5b932b0309a6d9d343cb5a.tar.gz
cpython-2737291134d398da9e5b932b0309a6d9d343cb5a.tar.bz2
backport ssl doc fixes (#2117)
* clarify recv() and send() on SSLObject (#2100) SSLObject has recv() and send(), but they don't do any network io. * remove extra word (#2101)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 16756e1..6c30a74 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -2107,8 +2107,8 @@ provided.
When compared to :class:`SSLSocket`, this object lacks the following
features:
- - Any form of network IO incluging methods such as ``recv()`` and
- ``send()``.
+ - Any form of network IO; ``recv()`` and ``send()`` read and write only to
+ the underlying :class:`MemoryBIO` buffers.
- There is no *do_handshake_on_connect* machinery. You must always manually
call :meth:`~SSLSocket.do_handshake` to start the handshake.