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

Fix previous fix (the cause was actually a misplaced #endif, or so it seems)

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

4
Modules/_ssl.c
View file

@ -2499,6 +2499,7 @@ error:
#endif #endif
return ret; return ret;
} }
#endif
PyDoc_STRVAR(PySSL_set_servername_callback_doc, PyDoc_STRVAR(PySSL_set_servername_callback_doc,
"set_servername_callback(method)\n\ "set_servername_callback(method)\n\
@ -2509,7 +2510,6 @@ the SSL/TLS client in the SNI extension.\n\
If the argument is None then the callback is disabled. The method is called\n\ If the argument is None then the callback is disabled. The method is called\n\
with the SSLSocket, the server name as a string, and the SSLContext object.\n\ with the SSLSocket, the server name as a string, and the SSLContext object.\n\
See RFC 6066 for details of the SNI"); See RFC 6066 for details of the SNI");
#endif
static PyObject * static PyObject *
set_servername_callback(PySSLContext *self, PyObject *args) set_servername_callback(PySSLContext *self, PyObject *args)
@ -2575,10 +2575,8 @@ 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 */
}; };