From: Christian Heimes <christian@python.org>
Date: Wed, 14 Mar 2018 06:40:20 +0000 (+0100)
Subject: bpo-30622: Fix backport of NPN fix (#6102)
X-Git-Tag: v3.6.5~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15b6400d6439aad9859faba91ce297dfeae8d31d;p=thirdparty%2FPython%2Fcpython.git

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>
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 2fe696daa5e1..c54e43c2b48a 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