]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8699d7 317bcb9)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 11 Jun 2014 06:19:21 +0000 (23:19 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 11 Jun 2014 06:19:21 +0000 (23:19 -0700)
* PHP-5.4:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next

Conflicts:
configure.in
main/php_version.h

1  2 
ext/spl/spl_array.c patch | diff1 | diff2 | blob | history

diff --cc ext/spl/spl_array.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.