summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2018-03-14 06:40:20 (GMT)
committerNed Deily <nad@python.org>2018-03-28 07:32:58 (GMT)
commit15b6400d6439aad9859faba91ce297dfeae8d31d (patch)
tree6d2eb6182cccb8a8d7ad3f7608b3fb03dd7a6816
parentf03c5148cfc6873df855bd0edca2940f9a5d8fd5 (diff)
downloadcpython-15b6400d6439aad9859faba91ce297dfeae8d31d.zip
cpython-15b6400d6439aad9859faba91ce297dfeae8d31d.tar.gz
cpython-15b6400d6439aad9859faba91ce297dfeae8d31d.tar.bz2
bpo-30622: Fix backport of NPN fix (#6102)
Fix backport a79591cf of bpo-30622 to 3.6 branch. Signed-off-by: Christian Heimes <christian@python.org>
-rw-r--r--Modules/_ssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 2fe696d..c54e43c 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2747,7 +2747,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
return NULL;
}
self->ctx = ctx;
-#ifdef HAVE_NPN
+#if HAVE_NPN
self->npn_protocols = NULL;
#endif
#if HAVE_ALPN