diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-03-28 00:22:09 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-03-28 00:22:09 +0000 |
commit | 543b35ad8648ed5af7999ca16a8299e937fc5bf8 (patch) | |
tree | 8ed69a8c506265c8da67e546fa30ecd8417a35d3 /Lib/ssl.py | |
parent | fd4e059645345fa0f4339dd44c09bfa3c76a82c5 (diff) | |
download | cpython-543b35ad8648ed5af7999ca16a8299e937fc5bf8.tar.gz |
Issue #23804: Fix SSL recv/read(0) to not return 1024 bytes
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r-- | Lib/ssl.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py index df39592327..65ad38f899 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -561,7 +561,7 @@ class SSLObject: server hostame is set.""" return self._sslobj.server_hostname - def read(self, len=0, buffer=None): + def read(self, len=1024, buffer=None): """Read up to 'len' bytes from the SSL object and return them. If 'buffer' is provided, read into this buffer and return the number of @@ -570,7 +570,7 @@ class SSLObject: 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 def write(self, data): @@ -776,7 +776,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.""" |