[Python-checkins] bpo-30622: Fix backport of NPN fix (#6102)

Christian Heimes webhook-mailer at python.org
Wed Mar 14 02:40:29 EDT 2018


https://github.com/python/cpython/commit/0ec0290a075ad3ac7d9990efd701c81da16293c0
commit: 0ec0290a075ad3ac7d9990efd701c81da16293c0
branch: 3.6
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2018-03-14T07:40:20+01:00
summary:

bpo-30622: Fix backport of NPN fix (#6102)

Fix backport a79591cf of bpo-30622 to 3.6 branch.

Signed-off-by: Christian Heimes <christian at python.org>

files:
M Modules/_ssl.c

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



More information about the Python-checkins mailing list