Merge branch 'PHP-5.4' into PHP-5.5

diff --cc NEWS
index cb6c695854fc3c383c44223f821ed42a1851f8de,3e33c1698797d55dcebcce55cbc27f6385503eb0..67ac75aad421f9b53c19eed23c77727216f0b0f3
--- 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 #67043 (substr_compare broke by previous change) (Tjerk)
+   . Fixed bug #67064  (Countable interface prevents using 2nd parameter
+     ($mode) of count() function). (Bob)
  
  - 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).