com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/json/json.c

Commit: 7c9209a0d1bba946c36f3df7745c0bc565adf632 Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 18:55:58 -0700 Parents: 0d4c28f2e13fd6357bb10a263d0fa509811e8d03 9bba219c75b0fa82846bc2fa260888cdc97ac6e6 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c9209a0d1bba946c36f3df7745c0bc565adf632 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fix #66021 (Blank line inside empty array/object) Bugs: https://bugs.php.net/66021 Changed paths: MM NEWS MM ext/json/json.c Diff: diff --cc NEWS index 42c0bdf,f571b56..d4311c6 --- a/NEWS +++ b/NEWS @@@ -27,12 -24,24 +27,16 @@@ PH - FPM: . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf). + - JSON: + . Fixed bug #66021 (Blank line inside empty array/object when + JSON_PRETTY_PRINT is set). (Kevin Israel) + -- mysqli: - . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter - (extra comma) and third parameters (lack of escaping). (Andrey) +- mysqlnd: + . Added a new fetching mode to mysqlnd. (Andrey) -- SimpleXML: - .. Fixed bug #66084 (simplexml_load_string() mangles empty node name) - (Anatol) +- PDO: + . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir). + (Matteo) - SQLite: . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)