diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-04 19:13:50 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-04 19:13:50 -0700 |
| commit | 6c1cdd08146924b28bcff6e15b03ff9def8736e2 (patch) | |
| tree | c65ff67b4df0c2111e90eb373447e8d1d05f8f4f | |
| parent | 60846fab58eac05dc74584e90424de87c2992e08 (diff) | |
| parent | 99fa59054d51770bb69a4fd8cc6d9b28a9bb9838 (diff) | |
| download | php-git-6c1cdd08146924b28bcff6e15b03ff9def8736e2.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed SNI failure from missing Z_STRVAL_PP
| -rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 92bcf0039c..a02d4f98aa 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -475,7 +475,7 @@ static inline int php_openssl_enable_crypto(php_stream *stream, ) { 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); + SSL_set_tlsext_host_name(sslsock->ssl_handle, Z_STRVAL_PP(val)); } else if (sslsock->url_name) { SSL_set_tlsext_host_name(sslsock->ssl_handle, sslsock->url_name); } |