STINNER Victor added the comment:
I converted issue22559.diff to a pull request. I only had one conflict!
--- Lib/ssl.py
+++ Lib/ssl.py
@@ -727,11 +857,7 @@ class SSLSocket(socket):
if not self._sslobj:
raise ValueError("Read on closed or unwrapped SSL socket.")
try:
- if buffer is not None:
- v = self._sslobj.read(len, buffer)
- else:
- v = self._sslobj.read(len or 1024)
- return v
+ return self._sslobj.read(len, buffer)
except SSLError as x:
if x.args[0] == SSL_ERROR_EOF and self.suppress_ragged_eofs:
if buffer is not None:
I fixed it by using "return self._sslobj.read(len, buffer)".
I added a second commit to synchronize Lib/ssl.py with master:
* add selected_alpn_protocol() method, needed by test_ssl
* change how the default size of read() is defined
* change how send()/write result is reported: handle
SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE
I tagged my PR as [WIP] since I'm not sure if I backported bpo-20951
"SSLSocket.send() returns 0 for non-blocking socket" by mistake or not :-)
Please review the PR carefully!
----------
_______________________________________
Python tracker <rep...@bugs.python.org>
<http://bugs.python.org/issue22559>
_______________________________________
_______________________________________________
Python-bugs-list mailing list
Unsubscribe:
https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
