From: Xinchen Hui Date: Wed, 15 Feb 2017 05:52:08 +0000 (+0800) Subject: Merge branch 'PHP-7.1' X-Git-Tag: php-7.2.0alpha1~363 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf91fc565c27f785a904156493ac305c197c61cc;p=php Merge branch 'PHP-7.1' * PHP-7.1: Add a test for hard_timeout(bug #74093) --- bf91fc565c27f785a904156493ac305c197c61cc