com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend_vm_def.h Zend/zend_
vm_execute.h ext/mysqlnd/mysqlnd_net.c ext/openssl/ xp_ssl.c ext/session/session.c ext/spl/spl_array. c ext/standard/basic_functions.c
ext/standard/http_fo pen_wrapper.c main/SAPI.c main/php_content_types .c sapi/cli/php_cli_server.c

Commit: 6ac9e106af2f7c84142cc22a0a910686420546a7 Author: Anatol Belski <ab@php.net> Mon, 21 Jul 2014 11:33:09 +0200 Parents: e98d429cc329d13a0451ad7ce11f93bd7d54d1a8 6696cbcc9af0c710c05f27393af38ca3403f6f42 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ac9e106af2f7c84142cc22a0a910686420546a7 Log: Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64 * origin/str_size_and_int64_56_backport: (132 commits) force atoll macro usage on windows Enable $ replacement in exif, ldap, pdo_pgsql and tidy See bug #67635 NEWS NEWS improve previous, add message during configure Fixed bug #67635 php links to systemd libraries without using pkg-config Improve fix for #66608 Fixed segfault with empty break New added opcodes don't need to be resloved Update NEWS Update NEWS Update NEWS Fixed bug #66827 Session raises E_NOTICE when session name variable is array implemented copy libs of core exts in phpize mode fix copy the ext dll into the prefix path in phpize mode fix default prefix in phpize mode fix file with zero size usage in phpize mode Update NEWS Fixed bug #66608 (Incorrect behavior with nested "finally" blocks) ... Conflicts: main/php_content_types.c Bugs: https://bugs.php.net/67635 https://bugs.php.net/66608 https://bugs.php.net/66827 Changed paths: MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/mysqlnd/mysqlnd_net.c MM ext/openssl/xp_ssl.c MM ext/session/session.c MM ext/spl/spl_array.c MM ext/standard/basic_functions.c MM ext/standard/http_fopen_wrapper.c MM main/SAPI.c MM main/php_content_types.c MM sapi/cli/php_cli_server.c Diff: diff --cc ext/openssl/xp_ssl.c index 2b30028,e6d05ce..414355b --- 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; }