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

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 913115824d9f9af3a6c26c782ab01ceab0951fac..3cec4b411fcc007d7ab38c30ce35a361fb504224 100644 (file)
--- 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)