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

Commit: 7e3cd7cadf015c63d1042899b7ba5e5719cb4ce5 Author: Andrey Hristov <andrey@php.net> Fri, 25 Sep 2015 14:29:06 +0200 Parents: 7e797f13026440c54e24f89cf29f46bb0b262a39 59de2c037c4c946fc43478edc154d89dda95873d Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=7e3cd7cadf015c63d1042899b7ba5e5719cb4ce5 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 76c2943,845d4a1..751a109 --- a/NEWS +++ b/NEWS @@@ -76,12 -20,10 +76,13 @@@ PH (Andrey) . Fixed bug #70456 (mysqlnd doesn't activate TCP keep-alive when connecting to a server). (Sergei Turchanov) + .. Fixed bug #70572 segfault in mysqlnd_connect. (Andrey, Remi) -- OpenSSL: - . Fixed bug #55259 (openssl extension does not get the DH parameters from +- Opcache: + . Fixed bug #70423 (Warning Internal error: wrong size calculation). (Anatol) + +- OpenSSL + . Fixed bug #55259 (openssl extension does not get the DH parameters from DH key resource). (Jakub Zelenka) . Fixed bug #70395 (Missing ARG_INFO for openssl_seal()). (cmb) . Fixed bug #60632 (openssl_seal fails with AES). (Jakub Zelenka) diff --cc ext/mysqlnd/mysqlnd_net.c index 72f7dfc,69f4b7a..d8ad4f7 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@@ -210,11 -206,13 +210,13 @@@ MYSQLND_METHOD(mysqlnd_net, open_tcp_or if (hashed_details) { mnd_sprintf_free(hashed_details); } + errcode = CR_CONNECTION_ERROR; - SET_CLIENT_ERROR(*error_info, errcode? errcode:CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, ZSTR_VAL(errstr)); + SET_CLIENT_ERROR(*error_info, + CR_CONNECTION_ERROR, + UNKNOWN_SQLSTATE, - errstr? errstr:"Unknown error while connecting"); ++ errstr? ZSTR_VAL(errstr):"Unknown error while connecting"); if (errstr) { -- /* no mnd_ since we don't allocate it */ - efree(errstr); + zend_string_release(errstr); } DBG_RETURN(NULL); }