]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9599acd a81cb64)
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Fri, 29 Jan 2016 09:24:15 +0000 (10:24 +0100)
committerRemi Collet <remi@php.net>
Fri, 29 Jan 2016 09:24:15 +0000 (10:24 +0100)
* PHP-5.6:
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup

1  2 
sapi/fpm/fpm/fpm_main.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.