[Python-checkins] r79913 - in python/branches/release26-maint: Modules/_ssl.c

antoine.pitrou python-checkins at python.org
Fri Apr 9 22:44:09 CEST 2010


Author: antoine.pitrou
Date: Fri Apr  9 22:44:09 2010
New Revision: 79913

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Modules/_ssl.c

Modified: python/branches/release26-maint/Modules/_ssl.c
==============================================================================
--- python/branches/release26-maint/Modules/_ssl.c	(original)
+++ python/branches/release26-maint/Modules/_ssl.c	Fri Apr  9 22:44:09 2010
@@ -368,7 +368,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)


More information about the Python-checkins mailing list