]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Wed, 15 Feb 2017 05:52:08 +0000 (13:52 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 15 Feb 2017 05:52:08 +0000 (13:52 +0800)
* PHP-7.1:
  Add a test for hard_timeout(bug #74093)


Trivial merge