]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Fri, 19 May 2017 15:56:31 +0000 (23:56 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 19 May 2017 15:56:31 +0000 (23:56 +0800)
* 'PHP-7.1' of git.php.net:/php-src:
  follow up fix on bug #74022
  Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators)


Trivial merge