diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-01-29 17:59:46 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-01-29 17:59:46 -0700 |
| commit | ba8cdc855d9ecff2688c869fcfb26b7e6925b684 (patch) | |
| tree | a72d7a5c0e06074fc3da6a9ff546f31f42267715 | |
| parent | c91ad8233b46e1605b225c782efc3131f158d9be (diff) | |
| parent | 43432c12f176d42d35c82345caef23fb016cec82 (diff) | |
| download | php-git-ba8cdc855d9ecff2688c869fcfb26b7e6925b684.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed build breakage from b4b4d9697f
| -rw-r--r-- | ext/openssl/xp_ssl.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index cc8ea8a033..0a9626128f 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -449,17 +449,6 @@ static inline int php_openssl_setup_crypto(php_stream *stream, return 0; } -static void enable_server_name_indication(php_stream_context *ctx, php_openssl_netstream_data_t *sslsock) -{ - zval **val = NULL; - - if (php_stream_context_get_option(ctx, "ssl", "SNI_server_name", &val) == SUCCESS) { - convert_to_string_ex(val); - SSL_set_tlsext_host_name(sslsock->ssl_handle, &val); - } else if (sslsock->url_name) { - SSL_set_tlsext_host_name(sslsock->ssl_handle, sslsock->url_name); - } -} static inline int php_openssl_enable_crypto(php_stream *stream, php_openssl_netstream_data_t *sslsock, @@ -467,7 +456,6 @@ static inline int php_openssl_enable_crypto(php_stream *stream, TSRMLS_DC) { int n, retry = 1; - zval **val = NULL; if (cparam->inputs.activate && !sslsock->ssl_active) { struct timeval start_time, @@ -475,13 +463,20 @@ static inline int php_openssl_enable_crypto(php_stream *stream, int blocked = sslsock->s.is_blocked, has_timeout = 0; -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) +#if OPENSSL_VERSION_NUMBER >= 0x00908070L && !defined(OPENSSL_NO_TLSEXT) + + zval **val; if (sslsock->is_client && (php_stream_context_get_option(stream->context, "ssl", "SNI_enabled", &val) == FAILURE - || zend_is_true(*val TSRMLS_CC)) + || zend_is_true(*val)) ) { - enable_server_name_indication(stream->context, sslsock); + if (php_stream_context_get_option(stream->context, "ssl", "SNI_server_name", &val) == SUCCESS) { + convert_to_string_ex(val); + SSL_set_tlsext_host_name(sslsock->ssl_handle, &val); + } else if (sslsock->url_name) { + SSL_set_tlsext_host_name(sslsock->ssl_handle, sslsock->url_name); + } } #endif |