| commit | 179fe5e36e8775093b9aec5bc084e7b0b24b8c5f | [log] [tgz] |
|---|---|---|
| author | Serhiy Storchaka <storchaka@gmail.com> | Tue Jan 27 22:32:34 2015 +0200 |
| committer | Serhiy Storchaka <storchaka@gmail.com> | Tue Jan 27 22:32:34 2015 +0200 |
| tree | b3260603fcd1596786f850f56dbe672532b2f84d | |
| parent | 0e0282eb144ed69616a2a7e0797cf31d58ab2276 [diff] | |
| parent | f4bb2311b1448cee1a6626ca80656b26a49b11ff [diff] |
Merge heads
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 1528742..6a88e0c 100644 --- 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