Mercurial > cpython-lru_cache-weakref
diff Modules/_ssl.c @ 60462:a792b9cb0d7a
Merged revisions 79910 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79910 | antoine.pitrou | 2010-04-09 22:38:39 +0200 (ven., 09 avril 2010) | 4 lines
SSL_MODE_AUTO_RETRY has been added in OpenSSL 0.9.6. Fix compilation
with earlier versions.
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Fri, 09 Apr 2010 20:42:09 +0000 |
| parents | 9e5e9d8fa847 |
| children | e5f6de18b715 |
line wrap: on
line diff
--- a/Modules/_ssl.c Thu Apr 08 13:55:29 2010 +0000 +++ b/Modules/_ssl.c Fri Apr 09 20:42:09 2010 +0000 @@ -369,7 +369,9 @@ self->ssl = SSL_new(self->ctx); /* New ssl struct */ PySSL_END_ALLOW_THREADS SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */ +#ifdef SSL_MODE_AUTO_RETRY SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY); +#endif /* If the socket is in non-blocking mode or timeout mode, set the BIO * to non-blocking mode (blocking is the default)