From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 28 Jun 2016 03:37:20 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha3~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9143d5ab2cb14f3aeb6eb3909e90e825b2c3030;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  MFH: Fixed fd leak (the origin commit can not be cherry-picked)

Conflicts:
	main/fastcgi.c
	sapi/cli/ps_title.c
---

e9143d5ab2cb14f3aeb6eb3909e90e825b2c3030