summaryrefslogtreecommitdiffstats
path: root/Modules/_ssl.c
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2018-03-14 06:40:20 (GMT)
committerGitHub <noreply@github.com>2018-03-14 06:40:20 (GMT)
commit0ec0290a075ad3ac7d9990efd701c81da16293c0 (patch)
treec31cddac22467457d4cac2f455e261e12fd533e5 /Modules/_ssl.c
parent4d04cae921702d22651b30fee54c0b2d29c62e17 (diff)
downloadcpython-0ec0290a075ad3ac7d9990efd701c81da16293c0.zip
cpython-0ec0290a075ad3ac7d9990efd701c81da16293c0.tar.gz
cpython-0ec0290a075ad3ac7d9990efd701c81da16293c0.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>
Diffstat (limited to 'Modules/_ssl.c')
-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