com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/mysqlnd/mysqlnd_net.c

From: Date: Mon, 16 Nov 2015 11:39:04 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/mysqlnd/mysqlnd_net.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89871@lists.php.net to get a copy of this message
Commit: 96406f08424b44772f91bf1b88ff7bde9bfd5b91 Author: Andrey Hristov <andrey@php.net> Mon, 16 Nov 2015 12:39:04 +0100 Parents: 9134f9e98f6ccf8ed91cd1271fee7855062c07ff 822400ef3b807f0a73b4c0879cdf4a802bf7e4fe Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=96406f08424b44772f91bf1b88ff7bde9bfd5b91 Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM NEWS MM ext/mysqlnd/mysqlnd_net.c Diff: diff --cc NEWS index 41e34e9,72cd4f9..842b72a --- a/NEWS +++ b/NEWS @@@ -20,29 -9,19 +20,34 @@@ PH - SOAP: . Fixed bug #70900 (SoapClient systematic out of memory error). (Dmitry) -26 Nov 2015, PHP 5.6.16 +- Standard: + .. Fixed bug #70910 (extract() breaks variable references). (Laruence) + +- Streams/Socket + . Add IPV6_V6ONLY constant / make it usable in stream contexts. (Bob) + +12 Nov 2015, PHP 7.0.0 RC 7 - Core: - . Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a - non-existent constant). (Laruence) - . Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l). + . Fixed bug #70249 (Segmentation fault while running PHPUnit tests on + phpBB 3.2-dev). (Laruence) + . Fixed bug #70873 (Regression on private static properties access). (Laruence) + . Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite). + (Dmitry, Laruence) + . Fixed bug #70862 (Several functions do not check return code of + php_stream_copy_to_mem()). (Anatol) + . Fixed bug #70863 (Incorect logic to increment_function for proxy objects). + (Anatol) + . Fixed bug #70842 (Persistent Stream Segmentation Fault). (Caleb Champlin) + . Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause + segfaults). (Aharvey, Laruence) + - Mysqlnd: + . Fixed bug #68344 (MySQLi does not provide way to disable peer certificate + validation) by introducing MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT + connection flag. (Andrey) + - OCI8: . Fixed bug #68298 (OCI int overflow) (Senthil). diff --cc ext/mysqlnd/mysqlnd_net.c index ccac6ad,2231e1d..952af3d --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@@ -978,17 -965,18 +978,21 @@@ MYSQLND_METHOD(mysqlnd_net, enable_ssl) ZVAL_BOOL(&verify_peer_zval, verify); php_stream_context_set_option(context, "ssl", "verify_peer", &verify_peer_zval); php_stream_context_set_option(context, "ssl", "verify_peer_name", &verify_peer_zval); + if (net->data->options.ssl_verify_peer == MYSQLND_SSL_PEER_DONT_VERIFY) { + ZVAL_TRUE(&verify_peer_zval); + php_stream_context_set_option(context, "ssl", "allow_self_signed", &verify_peer_zval); + } } - +#if PHP_API_VERSION >= 20131106 php_stream_context_set(net_stream, context); - if (php_stream_xport_crypto_setup(net_stream, STREAM_CRYPTO_METHOD_TLS_CLIENT, NULL TSRMLS_CC) < 0 || - php_stream_xport_crypto_enable(net_stream, 1 TSRMLS_CC) < 0) +#else + php_stream_context_set(net_stream, context); +#endif + if (php_stream_xport_crypto_setup(net_stream, STREAM_CRYPTO_METHOD_TLS_CLIENT, NULL) < 0 || + php_stream_xport_crypto_enable(net_stream, 1) < 0) { DBG_ERR("Cannot connect to MySQL by using SSL"); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot connect to MySQL by using SSL"); + php_error_docref(NULL, E_WARNING, "Cannot connect to MySQL by using SSL"); DBG_RETURN(FAIL); } net->data->ssl = TRUE;

« previous php.cvs (#89871) next »