From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 9 Apr 2010 20:42:09 +0000 (+0000)
Subject: Merged revisions 79910 via svnmerge from
X-Git-Tag: v3.2a1~1199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ae7b5897eed3c26e392049fa7162c56a2a7f772;p=python

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.
........
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index a41fd17cc7..5cb7e0a191 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)