changeset:   100777:72c457f9533a
parent:      100775:a90f5e2b7160
parent:      100776:7a3c5f7dda86
user:        Martin Panter <vadmium+py@gmail.com>
date:        Mon Mar 28 01:09:13 2016 +0000
files:       Lib/test/test_ssl.py Misc/NEWS
description:
Issue #23804: Merge SSL zero read fix from 3.5


diff -r a90f5e2b7160 -r 72c457f9533a Doc/library/ssl.rst
--- a/Doc/library/ssl.rst	Mon Mar 28 00:45:28 2016 +0300
+++ b/Doc/library/ssl.rst	Mon Mar 28 01:09:13 2016 +0000
@@ -842,7 +842,7 @@
 
 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
diff -r a90f5e2b7160 -r 72c457f9533a Lib/ssl.py
--- a/Lib/ssl.py	Mon Mar 28 00:45:28 2016 +0300
+++ b/Lib/ssl.py	Mon Mar 28 01:09:13 2016 +0000
@@ -561,7 +561,7 @@
         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 @@
         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 @@
             # 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."""
 
diff -r a90f5e2b7160 -r 72c457f9533a Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Mon Mar 28 00:45:28 2016 +0300
+++ b/Lib/test/test_ssl.py	Mon Mar 28 01:09:13 2016 +0000
@@ -2783,13 +2783,20 @@
                         # consume data
                         s.read()
 
+                data = b"data"
+
                 # read(-1, buffer) is supported, even though read(-1) is not
-                data = b"data"
                 s.send(data)
                 buffer = bytearray(len(data))
                 self.assertEqual(s.read(-1, buffer), len(data))
                 self.assertEqual(buffer, data)
 
+                # recv/read(0) should return no data
+                s.send(data)
+                self.assertEqual(s.recv(0), b"")
+                self.assertEqual(s.read(0), b"")
+                self.assertEqual(s.read(), data)
+
                 # Make sure sendmsg et al are disallowed to avoid
                 # inadvertent disclosure of data and/or corruption
                 # of the encrypted data stream
diff -r a90f5e2b7160 -r 72c457f9533a Misc/NEWS
--- a/Misc/NEWS	Mon Mar 28 00:45:28 2016 +0300
+++ b/Misc/NEWS	Mon Mar 28 01:09:13 2016 +0000
@@ -239,6 +239,9 @@
 - Issue #26644: Raise ValueError rather than SystemError when a negative
   length is passed to SSLSocket.recv() or read().
 
+- Issue #23804: Fix SSL recv(0) and read(0) methods to return zero bytes
+  instead of up to 1024.
+
 - Issue #26616: Fixed a bug in datetime.astimezone() method.
 
 - Issue #26637: The :mod:`importlib` module now emits an :exc:`ImportError`