com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/Zend.dsp ext/mysqlnd /mysqlnd_wireprotocol.c
ext/openssl/openssl.c ext/ope nssl/xp_ssl.c ext/pdo/pdo_dbh.c

Commit: 8da5217cd57cbd360a3c6cb8152af171718762c8 Author: Anatol Belski <ab@php.net> Wed, 29 Jan 2014 00:36:37 +0100 Parents: 68969026fc1a32e5d0691580a4e4091ed9e3bb4b 6edc84fcdfc8e76507bc73122310fff4b6170b88 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8da5217cd57cbd360a3c6cb8152af171718762c8 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 * origin/master: Update NEWS/UPGRADING Verify peers by default in client socket operations add text for the new constants add new consts Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition. fix *.dsp files related to bug #50333 Bugs: https://bugs.php.net/50333 Changed paths: MM Zend/Zend.dsp MM ext/mysqlnd/mysqlnd_wireprotocol.c MM ext/openssl/openssl.c MM ext/openssl/xp_ssl.c MM ext/pdo/pdo_dbh.c Diff: diff --cc ext/openssl/openssl.c index a924584,d57b3ea..07f7b65 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -5298,11 -5210,9 +5341,9 @@@ SSL *php_SSL_new_from_context(SSL_CTX * } if (GET_VER_OPT("verify_depth")) { - convert_to_long_ex(val); - SSL_CTX_set_verify_depth(ctx, Z_LVAL_PP(val)); + convert_to_int_ex(val); + SSL_CTX_set_verify_depth(ctx, Z_IVAL_PP(val)); } - } else { - SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL); } /* callback for the passphrase (for localcert) */