Skip to content

Commit cfd6200

Browse files
pitroupitrou
committed
Merged revisions 79448 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79448 | antoine.pitrou | 2010-03-26 20:27:16 +0100 (ven., 26 mars 2010) | 6 lines Issue python#8222: Enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking reads and writes are always retried by OpenSSL itself. (this is a followup to issue python#3890) ........
1 parent b5f0627 commit cfd6200

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎Misc/NEWS‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ Library
3232
didn't support chflags() (for example ZFS under FreeBSD). The error is
3333
now silenced.
3434

35-
- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
35+
- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets.
36+
Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking
37+
reads and writes are always retried by OpenSSL itself.
3638

3739
- Issue #6544: fix a reference leak in the kqueue implementation's error
3840
handling.

‎Modules/_ssl.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
directly.
1010
1111
XXX should partial writes be enabled, SSL_MODE_ENABLE_PARTIAL_WRITE?
12-
13-
XXX what about SSL_MODE_AUTO_RETRY?
1412
*/
1513

1614
#include "Python.h"
@@ -370,6 +368,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
370368
self->ssl = SSL_new(self->ctx); /* New ssl struct */
371369
PySSL_END_ALLOW_THREADS
372370
SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */
371+
SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY);
373372

374373
/* If the socket is in non-blocking mode or timeout mode, set the BIO
375374
* to non-blocking mode (blocking is the default)

0 commit comments

Comments
 (0)