Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

diff --cc NEWS
index cb6c695854fc3c383c44223f821ed42a1851f8de,4d5441e28ed06ea9db0392bc75f81f75f387a1c2..b08e875d3bbad984f43fb1c2c341a4cc93c4ca30
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,12 -6,13 +5,14 @@@ PH
    . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
    . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace 
      UNIX sockets). (Mike)
 -  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)
 +  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)  
    . Fixed bug #66736 (fpassthru broken). (Mike)
 -  . Fixed bug #67024 (getimagesize should recognize BMP files with negative 
++  . Fixed bug #67024 (getimagesize should recognize BMP files with negative
+     height). (Gabor Buella)
 +  . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk)
  
  - Embed:
 -  . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol)
 +  . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol).
  
  - Fileinfo:
    . Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).