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

http://hg.python.org/cpython/rev/fc4f68b51ba0 changeset: 83024:fc4f68b51ba0 user: Antoine Pitrou <solipsis@pitrou.net> date: Sat Mar 30 16:39:00 2013 +0100 summary: Fix previous fix (the cause was actually a misplaced #endif, or so it seems) files: Modules/_ssl.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2499,6 +2499,7 @@ #endif return ret; } +#endif PyDoc_STRVAR(PySSL_set_servername_callback_doc, "set_servername_callback(method)\n\ @@ -2509,7 +2510,6 @@ 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\ See RFC 6066 for details of the SNI"); -#endif static PyObject * set_servername_callback(PySSLContext *self, PyObject *args) @@ -2575,10 +2575,8 @@ {"set_ecdh_curve", (PyCFunction) set_ecdh_curve, METH_O, NULL}, #endif -#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) {"set_servername_callback", (PyCFunction) set_servername_callback, METH_VARARGS, PySSL_set_servername_callback_doc}, -#endif {NULL, NULL} /* sentinel */ }; -- Repository URL: http://hg.python.org/cpython
participants (1)
-
antoine.pitrou