diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-09 20:42:09 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-09 20:42:09 (GMT) |
| commit | 0ae7b5897eed3c26e392049fa7162c56a2a7f772 (patch) | |
| tree | b547fe8856eb5be342fa28658ddcf65b2fa4551a | |
| parent | 48f16f9297682ce0e01f0edfb5e4ab6f99ead7da (diff) | |
| download | cpython-0ae7b5897eed3c26e392049fa7162c56a2a7f772.zip cpython-0ae7b5897eed3c26e392049fa7162c56a2a7f772.tar.gz cpython-0ae7b5897eed3c26e392049fa7162c56a2a7f772.tar.bz2 | |
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.
........
| -rw-r--r-- | Modules/_ssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index a41fd17..5cb7e0a 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) |