UPGRADING and NEWS

2 files changed, 14 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index fcf34c3fb9..0fe7e6825a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
 - FTP:
   . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
 
+- JSON
+  . Fixed whitespace part of bug #64874 ("json_decode handles whitespace and
+    case-sensitivity incorrectly")
+
 - Sockets:
   . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
     (Mike)
diff --git a/UPGRADING b/UPGRADING
index e6f582a4a8..edcaa17b30 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -492,6 +492,16 @@ 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
 ===========================