summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-03-28 01:09:13 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-03-28 01:09:13 (GMT)
commitef4bb1e994fbb7cab5ae29bb1d6763e0e7306642 (patch)
tree2cf15b4e15a7053009b24a9bbcdba0231725acbd /Doc
parent2a65ecb780e2a5cd47bc4b9af947b1127e972a11 (diff)
parentf6b1d66a3ca060247e03e7b198db8a5a966b836e (diff)
downloadcpython-ef4bb1e994fbb7cab5ae29bb1d6763e0e7306642.zip
cpython-ef4bb1e994fbb7cab5ae29bb1d6763e0e7306642.tar.gz
cpython-ef4bb1e994fbb7cab5ae29bb1d6763e0e7306642.tar.bz2
Issue #23804: Merge SSL zero read fix from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 79b1a47..98e866f 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -842,7 +842,7 @@ SSL Sockets
SSL sockets also have the following additional methods and attributes:
-.. method:: SSLSocket.read(len=0, buffer=None)
+.. method:: SSLSocket.read(len=1024, buffer=None)
Read up to *len* bytes of data from the SSL socket and return the result as
a ``bytes`` instance. If *buffer* is specified, then read into the buffer