summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2015-02-02 11:11:05 +0000
committerAdam Harvey <aharvey@php.net>2015-02-02 11:11:05 +0000
commitdb375cfd4dc2aabcd042c3a7cdd3c7faa479d557 (patch)
tree4c8fbb2cf3a08df28bce2bd2aaa0f561c50a99b2 /NEWS
parent675a12bbcfa0015198fb612b6850ad99c2e6977e (diff)
parenta7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8 (diff)
downloadphp-git-db375cfd4dc2aabcd042c3a7cdd3c7faa479d557.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index eaa587b7a3..4b07bb20ec 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,10 @@
. Fixed bug #68571 (core dump when webserver close the socket).
(redfoxli069 at gmail dot com, Laruence)
+- JSON:
+ . Fixed bug #68938 (json_decode() decodes empty string without error).
+ (jeremy at bat-country dot us)
+
- LIBXML:
. Fixed bug #64938 (libxml_disable_entity_loader setting is shared
between threads). (Martin Jansen)