Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news

diff --cc NEWS
index 5ee5c567a665bdedef3e9e7e320cc527dd8cd71c,03f8b87daf95e520b8158f7e35dcb18bd3cf2bd2..aaf308804a010e72f2d77ebd704e4aca5358cb42
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -13,12 -10,9 +13,12 @@@ PH
      by tempnam()). (Boro Sitnikovski)
    . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
    . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
-     zend_exceptions.c) (backported fix from PHP 5.6; initially committed
-     to wrong branch). (Bob)
+     zend_exceptions.c). (Bob)
+   . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
  
 +- Curl:
 +  . Fixed bug #64247 (CURLOPT_INFILE doesn't allow reset). (Mike)
 +
  - Date:
    . Fixed bug #67118 (DateTime constructor crash with invalid data). (Anatol)
  

diff --cc ext/spl/spl_fixedarray.c
Simple merge