diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-06-28 11:37:20 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-06-28 11:37:20 +0800 |
| commit | e9143d5ab2cb14f3aeb6eb3909e90e825b2c3030 (patch) | |
| tree | 27339c1cc769864fcf9042bb33f3a5729cb50876 /sapi/cli/php_cli.c | |
| parent | 7d729d9cc02af49bd427a1ee8f3d20d810dde485 (diff) | |
| parent | de7a6b1232ac863fb604cdec361a6b7e8e94384e (diff) | |
| download | php-git-e9143d5ab2cb14f3aeb6eb3909e90e825b2c3030.tar.gz | |
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
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions