granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9599acd a81cb64)

author	Remi Collet <remi@php.net>
	Fri, 29 Jan 2016 09:24:15 +0000 (10:24 +0100)
committer	Remi Collet <remi@php.net>
	Fri, 29 Jan 2016 09:24:15 +0000 (10:24 +0100)
commit	c0802af52c14172197f381988a5ba7d95cc43384
tree	2a0c16ba1a5abc1b1ac82c6cdf26c2bcaa25f2ab	tree \| snapshot
parent	9599acdef6262842b1419acb93543ec8f4dfd593	commit \| diff
parent	a81cb64a96a824be8c6a02a45f6e6c16eca4604d	commit \| diff

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
NEWS
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup

sapi/fpm/fpm/fpm_main.c

Unnamed repository; edit this file 'description' to name the repository.