mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 15:42:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Issue #23804: Fix SSL recv/read(0) to not return 1024 bytes

Browse source
This commit is contained in:
Martin Panter 2016-03-28 00:22:09 +00:00
parent ce913877e4
commit f6b1d66a3c
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/ssl.py
View file

@ -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."""