From: Stanislav Malyshev <stas@php.net>
Date: Sun, 13 Apr 2014 22:54:26 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=733b09442d40ae2803ca1ffd073a74ca4a8ebb07;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66721
---

733b09442d40ae2803ca1ffd073a74ca4a8ebb07
diff --cc NEWS
index 988408154c,92b2961df8..67c7b54891
--- a/NEWS
+++ b/NEWS
@@@ -5,14 -6,17 +5,18 @@@ 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)
  
+ - Date:
+   . Fixed bug #66721 (__wakeup of DateTime segfaults when invalid object data is
+     supplied). (Boro Sitnikovski)
+ 
  - 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).