com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Wed, 16 Jul 2014 04:15:05 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79476@lists.php.net to get a copy of this message | ||
Commit: a0cc25bbfbe923881f1902fabefecad1e257eb31
Author: Daniel Lowrey <rdlowrey@php.net> Wed, 16 Jul 2014 00:15:05 -0400
Parents: 1fef4e87fcba82e4e937382063483ee61f764936 33de1dece8d54c1e194a4c5cad374567eb838927
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a0cc25bbfbe923881f1902fabefecad1e257eb31
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM ext/openssl/xp_ssl.c
Diff:
diff --cc ext/openssl/xp_ssl.c
index fbfb077,948bb14..9fbbb6d
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -1166,9 -1164,10 +1166,10 @@@ static int set_server_specific_opts(php
ssl_ctx_options |= SSL_OP_SINGLE_DH_USE;
}
+ #ifdef HAVE_ECDH
if (SUCCESS == php_stream_context_get_option(
stream->context, "ssl", "single_ecdh_use", &val) &&
- zend_is_true(*val)
+ zend_is_true(*val TSRMLS_CC)
) {
ssl_ctx_options |= SSL_OP_SINGLE_ECDH_USE;
}