com php-src: Fixed SNI failure from missing Z_STRVAL_PP: ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Wed, 05 Feb 2014 02:11:56 +0000 |
| Subject: | com php-src: Fixed SNI failure from missing Z_STRVAL_PP: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75900@lists.php.net to get a copy of this message | ||
Commit: 99fa59054d51770bb69a4fd8cc6d9b28a9bb9838
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 4 Feb 2014 19:11:56 -0700
Parents: 78815f9034e36d734cace49827b7d8a7b3789371
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99fa59054d51770bb69a4fd8cc6d9b28a9bb9838
Log:
Fixed SNI failure from missing Z_STRVAL_PP
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index fe2a43b..523062e 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);
}