summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-03-28 00:22:09 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-03-28 00:22:09 (GMT)
commitd524b705afd09bad3d097cb413eff342dd5a5982 (patch)
tree28216d140025b17900d57e2d2d45e94aa0acf3e7 /Lib/ssl.py
parentb8089b4dde2986da237ee471c8f3645ec8a5975f (diff)
downloadcpython-d524b705afd09bad3d097cb413eff342dd5a5982.zip
cpython-d524b705afd09bad3d097cb413eff342dd5a5982.tar.gz
cpython-d524b705afd09bad3d097cb413eff342dd5a5982.tar.bz2
Issue #23804: Fix SSL recv/read(0) to not return 1024 bytes
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index febc547..d778638 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -625,7 +625,7 @@ class SSLSocket(socket):
# EAGAIN.
self.getpeername()
- def read(self, len=0, buffer=None):
+ def read(self, len=1024, buffer=None):
"""Read up to LEN bytes and return them.
Return zero-length string on EOF."""
@@ -636,7 +636,7 @@ class SSLSocket(socket):
if buffer is not None:
v = self._sslobj.read(len, buffer)
else:
- v = self._sslobj.read(len or 1024)
+ v = self._sslobj.read(len)
return v
except SSLError as x:
if x.args[0] == SSL_ERROR_EOF and self.suppress_ragged_eofs: