From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 13 Apr 2014 17:37:06 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=191d9fc22740ba99968a6275c8d5a96460a66dbf;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

191d9fc22740ba99968a6275c8d5a96460a66dbf
diff --cc NEWS
index cb6c695854,3e33c16987..67ac75aad4
--- a/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).