From 543b35ad8648ed5af7999ca16a8299e937fc5bf8 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Mon, 28 Mar 2016 00:22:09 +0000 Subject: Issue #23804: Fix SSL recv/read(0) to not return 1024 bytes --- Lib/ssl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/ssl.py') 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.""" -- cgit v1.2.1