From d59ceb5b7c9cd6f0ea049ec953977a6f0aebc565 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 9 Apr 2010 20:47:00 +0000 Subject: [PATCH] Merged revisions 79912 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79912 | antoine.pitrou | 2010-04-09 22:42:09 +0200 (ven., 09 avril 2010) | 10 lines 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. ........ ................ --- Modules/_ssl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 913115824d..3cec4b411f 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -369,7 +369,9 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file, 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) -- 2.50.0