]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d729d9 de7a6b1)
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 28 Jun 2016 03:37:20 +0000 (11:37 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 28 Jun 2016 03:37:20 +0000 (11:37 +0800)
* PHP-7.0:
  MFH: Fixed fd leak (the origin commit can not be cherry-picked)

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

1  2 
main/fastcgi.c patch | diff1 | diff2 | blob | history

diff --cc main/fastcgi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.