com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/openssl/openssl.c ext/session/mod_files.c

Commit: 8bc82718aecf60696d2d0a9517403f8a282e3573 Author: Stanislav Malyshev <stas@php.net> Mon, 14 Apr 2014 13:35:00 -0700 Parents: 22acea99ff3456abf316e838bfdabe37628e36f8 a186312832207437e4783024dcdece5232ac6c39 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8bc82718aecf60696d2d0a9517403f8a282e3573 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fix #66942: openssl_seal() memory leak ws fix Conflicts: ext/openssl/openssl.c Bugs: https://bugs.php.net/66942 Changed paths: MM NEWS MM ext/openssl/openssl.c MM ext/session/mod_files.c Diff: diff --cc NEWS index f571b56,6caf4c4..0c155d8 --- a/NEWS +++ b/NEWS @@@ -35,10 -37,13 +35,17 @@@ PH . Fixed bug #66021 (Blank line inside empty array/object when JSON_PRETTY_PRINT is set). (Kevin Israel) + - LDAP: + . Fixed issue with null bytes in LDAP bindings. (Matthew Daley) + +- mysqli: + . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter + (extra comma) and third parameters (lack of escaping). (Andrey) + + - OpenSSL: + . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma) + . Fix bug #66952 (memory leak in openssl_open()). (Chuan Ma) + - SimpleXML: . Fixed bug #66084 (simplexml_load_string() mangles empty node name) (Anatol)