Add missing NEWS and UPGRADING for bug #68938

diff --git a/NEWS b/NEWS
index 5ada8e57e7bafc22262a01a657ebaced33cbeb99..dcfe1a5ff7cc2f3e622c548f9c31db8004ca1648 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -75,9 +75,11 @@
   . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
   . Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
 
-- Json
+- JSON
   . Replace non-free JSON parser with a parser from Jsond extension, fixes #63520
     (JSON extension includes a problematic license statement). (Jakub Zelenka)
+  . Fixed bug #68938 (json_decode() decodes empty string without error).
+    (jeremy at bat-country dot us)
 
 - LiteSpeed:
   . Updated LiteSpeed SAPI code from V5.5 to V6.6. (George Wang)

diff --git a/UPGRADING b/UPGRADING
index 0d3e51d57467f4e526a9c800c1a572cf7a7e3ded..0ea6a090002f6388917b2321734e735b11537eb2 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -107,9 +107,10 @@ PHP X.Y UPGRADE NOTES
     instead.
   . Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime().
 
-- Json:
+- JSON:
   . Rejected RFC 7159 incompatible number formats in json_decode string -
         top level (07, 0xff, .1, -.1) and all levels ([1.], [1.e1])
+  . Empty PHP string passed to json_encode emits a JSON syntax error.
 
 - Stream:
   . Removed set_socket_blocking() in favor of its alias stream_set_blocking().