summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-04-13 18:54:54 -0700
committerStanislav Malyshev <stas@php.net>2014-04-13 18:55:28 -0700
commit9bba219c75b0fa82846bc2fa260888cdc97ac6e6 (patch)
treef8416289eda8a7a157e21b7fd68c4dc47da7b71e /NEWS
parent30ec1c005188e523eabc90741b3d8eda0cb81070 (diff)
parent5e66ce929350b98003becd362464d47e8f49c8fb (diff)
downloadphp-git-9bba219c75b0fa82846bc2fa260888cdc97ac6e6.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix #66021 (Blank line inside empty array/object)
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 3de1f3d330..f571b560ee 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,10 @@ PHP NEWS
- 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)