Merge heads

This commit is contained in:
Serhiy Storchaka 2015-01-27 22:32:34 +02:00
commit 179fe5e36e
1 changed files with 1 additions and 1 deletions

View File

@ -106,7 +106,7 @@ struct py_ssl_library_code {
#endif #endif
/* ALPN added in OpenSSL 1.0.2 */ /* 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 # define HAVE_ALPN
#endif #endif