Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

diff --cc NEWS
index d0359fe185f4162d11ca16933e11ef453af7a7cc,029e975b64cc97bf320588c48f52bc3c7909672e..9cacb5fd1adcccc2941bf5992a766cb2e05aa025
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,32 -1,39 +1,39 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.23
 -
 -- Core:
 -  . Fixed bug #65947 (basename is no more working after fgetcsv in certain 
 -    situation). (Laruence)
++?? ??? 2013, PHP 5.5.7
+ 
+ - 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)
 -
 -- PDO
 -  . Fixed bug 65946 (sql_parser permanently converts values bound to strings)
+ 
 -?? ??? 2013, PHP 5.4.22
 +?? ??? 2013, PHP 5.5.6
  
  - Core:
 +  . Fixed bug #65947 (basename is no more working after fgetcsv in certain 
 +    situation). (Laruence)
 +  . Improved performance of array_merge() and func_get_args() by eliminating
 +    useless copying. (Dmitry)
 +  . Fixed bug #65939 (Space before ";" breaks php.ini parsing).
 +    (brainstorm at nopcode dot org)
    . Fixed bug #65911 (scope resolution operator - strange behavior with $this).
      (Bob Weinand)
 +  . Fixed bug #65936 (dangling context pointer causes crash). (Tony)
  
 -- CLI server:
 -  . Fixed bug #65818 (Segfault with built-in webserver and chunked transfer 
 -    encoding). (Felipe)
 +- FPM:
 +  . Changed default listen() backlog to 65535. (Tony)
  
 -- Exif:
 -  . Fixed crash on unknown encoding. (Draal)
 +- MySQLi:
 +  . Fixed bug #66043 (Segfault calling bind_param() on mysqli). (Laruence)
  
 -- FTP:
 -  . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
 +- OPcache
 +  . Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
 +  . Fixed issue #115 (path issue when using phar). (Dmitry)
 +  . Fixed issue #149 (Phar mount points not working with OPcache enabled).
 +  (Dmitry)
  
 -- ODBC:
 -  . Fixed bug #65950 (Field name truncation if the field name is bigger than 
 +- ODBC
 +  . Fixed bug #65950 (Field name truncation if the field name is bigger than
      32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo)
  
  - PDO:

diff --cc ext/json/json.c
Simple merge