From: Stanislav Malyshev <stas@php.net>
Date: Tue, 2 Jun 2015 05:53:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-7.0.0alpha1~53^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e96c64ed5e0786c067259ad8728ded0085762632;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
---

e96c64ed5e0786c067259ad8728ded0085762632
diff --cc NEWS
index 070438572b,e83f8c7483..a1fdd25a38
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,14 +1,23 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2015, PHP 5.5.26
 +?? Jul 2015, PHP 5.6.11
 +
++- SPL:
++  . Fixed bug #69737 (Segfault when SplMinHeap::compare produces fatal error).
++    (Stas)
++
 +11 Jun 2015, PHP 5.6.10
  
  - Core:
 -  . Fixed bug #69566 (Conditional jump or move depends on uninitialised value
 -    in extension trait). (jbboehr at gmail dot com)
    . Fixed bug #66048 (temp. directory is cached during multiple requests).
      (Julien)
 +  . Fixed bug #69566 (Conditional jump or move depends on uninitialised value
 +    in extension trait). (jbboehr at gmail dot com)
 +  . Fixed bug #69599 (Strange generator+exception+variadic crash). (Nikita)
    . Fixed bug #69628 (complex GLOB_BRACE fails on Windows).
      (Christoph M. Becker)
 +  . Fixed POST data processing slowdown due to small input buffer size
 +    on Windows. (Jorge Oliveira, Anatol)
    . Fixed bug #69703 (Use __builtin_clzl on PowerPC).
      (dja at axtens dot net, Kalle)
    . Fixed bug #69732 (can induce segmentation fault with basic php code).