com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/spl/spl _array.c
| From: | Stanislav Malyshev | Date: | Wed, 11 Jun 2014 06:19:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/spl/spl _array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78825@lists.php.net to get a copy of this message | ||
Commit: f11bba492978cc83cbe731788942a312c77418c1
Author: Stanislav Malyshev <stas@php.net> Tue, 10 Jun 2014 23:19:21 -0700
Parents: e8699d75da9d3b0cc16b9454f12928defb6e72fc 317bcb96d01a1dade28f2875bdd9bbbf73a40160
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f11bba492978cc83cbe731788942a312c77418c1
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
Bugs:
https://bugs.php.net/66127
Changed paths:
MM ext/spl/spl_array.c
Diff: