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

tiran · web-flow · commit 0ec0290a075a · 2018-03-14T07:40:20.000+01:00
Fix backport a79591c 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -2747,7 +2747,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)`
`2747`	`2747`	`return NULL;`
`2748`	`2748`	`}`
`2749`	`2749`	`self->ctx = ctx;`
`2750`		`-#ifdef HAVE_NPN`
	`2750`	`+#if HAVE_NPN`
`2751`	`2751`	`self->npn_protocols = NULL;`
`2752`	`2752`	`#endif`
`2753`	`2753`	`#if HAVE_ALPN`