mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 11:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix compilation under MSVC: ssl_set_mode() is a macro, and the MSVC preprocessor doesn't process #ifdef's inside a macro argument list.

Browse source 
(found explanation at http://www.tech-archive.net/Archive/VC/microsoft.public.vc.language/2007-05/msg00385.html)
This commit is contained in:
Antoine Pitrou 2013-05-25 13:23:03 +02:00
parent 765f3cce48
commit 19fef69b75
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/_ssl.c
View file

@ -470,6 +470,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
{ {
PySSLSocket *self; PySSLSocket *self;
SSL_CTX *ctx = sslctx->ctx; SSL_CTX *ctx = sslctx->ctx;
long mode;
self = PyObject_New(PySSLSocket, &PySSLSocket_Type); self = PyObject_New(PySSLSocket, &PySSLSocket_Type);
if (self == NULL) if (self == NULL)
@ -490,11 +491,11 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS
SSL_set_app_data(self->ssl,self); SSL_set_app_data(self->ssl,self);
SSL_set_fd(self->ssl, sock->sock_fd); 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 #ifdef SSL_MODE_AUTO_RETRY
| SSL_MODE_AUTO_RETRY mode |= SSL_MODE_AUTO_RETRY;
#endif #endif
); SSL_set_mode(self->ssl, mode);
#if HAVE_SNI #if HAVE_SNI
if (server_hostname != NULL) if (server_hostname != NULL)