mirror of
https://github.com/python/cpython.git
synced 2024-11-23 18:04:37 +08:00
Fix compilation under MSVC: ssl_set_mode() is a macro, and the MSVC preprocessor doesn't process #ifdef's inside a macro argument list.
(found explanation at http://www.tech-archive.net/Archive/VC/microsoft.public.vc.language/2007-05/msg00385.html)
This commit is contained in:
parent
765f3cce48
commit
19fef69b75
@ -470,6 +470,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
|
||||
{
|
||||
PySSLSocket *self;
|
||||
SSL_CTX *ctx = sslctx->ctx;
|
||||
long mode;
|
||||
|
||||
self = PyObject_New(PySSLSocket, &PySSLSocket_Type);
|
||||
if (self == NULL)
|
||||
@ -490,11 +491,11 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
|
||||
PySSL_END_ALLOW_THREADS
|
||||
SSL_set_app_data(self->ssl,self);
|
||||
SSL_set_fd(self->ssl, sock->sock_fd);
|
||||
SSL_set_mode(self->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
|
||||
mode = SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
|
||||
#ifdef SSL_MODE_AUTO_RETRY
|
||||
| SSL_MODE_AUTO_RETRY
|
||||
mode |= SSL_MODE_AUTO_RETRY;
|
||||
#endif
|
||||
);
|
||||
SSL_set_mode(self->ssl, mode);
|
||||
|
||||
#if HAVE_SNI
|
||||
if (server_hostname != NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user