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

Further compiling fixes (issue #17581)

Browse source
This commit is contained in:
Antoine Pitrou 2013-03-30 16:36:54 +01:00
parent 9498839a1a
commit 41f8c4f5e4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/_ssl.c
View file

@ -1207,7 +1207,7 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value,
#if !HAVE_SNI #if !HAVE_SNI
PyErr_SetString(PyExc_NotImplementedError, "setting a socket's " PyErr_SetString(PyExc_NotImplementedError, "setting a socket's "
"context is not supported by your OpenSSL library"); "context is not supported by your OpenSSL library");
return NULL; return -1;
#else #else
Py_INCREF(value); Py_INCREF(value);
Py_DECREF(self->ctx); Py_DECREF(self->ctx);
@ -2542,6 +2542,7 @@ set_servername_callback(PySSLContext *self, PyObject *args)
"The TLS extension servername callback, " "The TLS extension servername callback, "
"SSL_CTX_set_tlsext_servername_callback, " "SSL_CTX_set_tlsext_servername_callback, "
"is not in the current OpenSSL library."); "is not in the current OpenSSL library.");
return NULL;
#endif #endif
} }
@ -2574,8 +2575,10 @@ static struct PyMethodDef context_methods[] = {
{"set_ecdh_curve", (PyCFunction) set_ecdh_curve, {"set_ecdh_curve", (PyCFunction) set_ecdh_curve,
METH_O, NULL}, METH_O, NULL},
#endif #endif
#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT)
{"set_servername_callback", (PyCFunction) set_servername_callback, {"set_servername_callback", (PyCFunction) set_servername_callback,
METH_VARARGS, PySSL_set_servername_callback_doc}, METH_VARARGS, PySSL_set_servername_callback_doc},
#endif
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };