summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2013-11-10 15:46:31 -0500
committerAdam Harvey <aharvey@php.net>2013-11-10 15:46:31 -0500
commitc9cfd98bcdcd92aa0efebda6ab8a3db5605a6796 (patch)
treea3aad08762f1d1749d11b5acd47fc4e67484458f
parent288e9c642375663cd6eb232ad1b236df912e787e (diff)
downloadphp-git-c9cfd98bcdcd92aa0efebda6ab8a3db5605a6796.tar.gz
Update NEWS and remove the unnecessary UPGRADING note.
-rw-r--r--NEWS4
-rwxr-xr-xUPGRADING10
2 files changed, 4 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 4689a436ca..029e975b64 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP NEWS
. Fixed bug #65947 (basename is no more working after fgetcsv in certain
situation). (Laruence)
+- JSON
+ . Fixed whitespace part of bug #64874 ("json_decode handles whitespace and
+ case-sensitivity incorrectly"). (Andrea Faulds)
+
- MySQLi:
. Fixed bug #66043 (Segfault calling bind_param() on mysqli). (Laruence)
diff --git a/UPGRADING b/UPGRADING
index edcaa17b30..e6f582a4a8 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -492,16 +492,6 @@ b. Extensions with changed behavior
- the output of the tiger hash family has been corrected, see
https://bugs.php.net/61307
- - JSON extension
- - Fixed whitespace part of bug #64874 ("json_decode handles whitespace and
- case-sensitivity incorrectly")
- This means that leading and trailing whitespace when deserialising lone
- JSON null, true, false, string and number values no longer causes an
- error. Please note that this only applies to the deserialising of strings
- containing only a null, true, false, string or number value. Leading and
- trailing whitespace around and inside objects and arrays has never caused
- an error.
-
===========================
10. Changes in SAPI support
===========================