]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Tue, 19 Apr 2016 02:59:35 +0000 (10:59 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 19 Apr 2016 02:59:35 +0000 (10:59 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Prevent usage in GC after free.
  Fix SEND_USER as well
  Fix SEND_ARRAY+PREFER_REF SHM corruption


Trivial merge