]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 2 Jun 2015 05:55:16 +0000 (22:55 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Jun 2015 05:55:16 +0000 (22:55 -0700)
commit75d16a4564d4bdb2991094d06b0529c47bd30ac3
treeff53737b4453644dd95c985fd200df2daceac2bd
parentce862a25d52850d93e16f784c1953f9a4c50fadc
parente96c64ed5e0786c067259ad8728ded0085762632
Merge branch 'PHP-5.6'

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

Conflicts:
ext/spl/spl_heap.c
ext/spl/spl_heap.c