com php-src: Prevent implicit function declaration when TLSEXT unavailable: ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Wed, 26 Feb 2014 02:12:33 +0000 |
| Subject: | com php-src: Prevent implicit function declaration when TLSEXT unavailable: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76215@lists.php.net to get a copy of this message | ||
Commit: 2bc0dbab443c54425c235590a43af65a80dc7392
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 25 Feb 2014 19:12:33 -0700
Parents: 781d0b9ee3e950a44683fb2a2f2b427aa73e1292
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2bc0dbab443c54425c235590a43af65a80dc7392
Log:
Prevent implicit function declaration when TLSEXT unavailable
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 8971cda..7424cd8 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -800,6 +800,7 @@ static int php_enable_server_crypto_opts(php_stream *stream,
return 1;
}
+#if OPENSSL_VERSION_NUMBER >= 0x00908070L && !defined(OPENSSL_NO_TLSEXT)
static inline void enable_client_sni(php_stream *stream, php_openssl_netstream_data_t *sslsock) /*
{{{ */
{
zval **val;
@@ -819,6 +820,7 @@ static inline void enable_client_sni(php_stream *stream, php_openssl_netstream_d
}
}
/* }}} */
+#endif
static inline int php_openssl_enable_crypto(php_stream *stream,
php_openssl_netstream_data_t *sslsock,