[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/1fef24e8a78b
changeset:   94341:1fef24e8a78b
branch:      2.7
parent:      94338:e6b9e277fbf4
parent:      94337:f7fd2776e80d
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Jan 27 22:32:34 2015 +0200
summary:
  Merge heads

files:
  Modules/_ssl.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -106,7 +106,7 @@
 #endif
 
 /* ALPN added in OpenSSL 1.0.2 */
-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
 # define HAVE_ALPN
 #endif
 

-- 
Repository URL: https://hg.python.org/cpython