]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27528b6 881416c)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 5 Dec 2012 13:55:21 +0000 (17:55 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 5 Dec 2012 13:55:21 +0000 (17:55 +0400)
* PHP-5.4:
  Fixed bug #63680 (Memleak in splfixedarray with cycle reference)

Conflicts:
NEWS

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

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