From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 19 May 2017 15:56:31 +0000 (+0800)
Subject: Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
X-Git-Tag: php-7.1.6RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08293a960b21b4ae3bb554d3033cb34a90f34fb3;p=php

Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* '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)
---

08293a960b21b4ae3bb554d3033cb34a90f34fb3