com php-src: Merge branch 'PHP-5.6' into PHP-7.0: sapi/fpm/fpm/ fpm_main.c
| From: | Remi Collet | Date: | Fri, 29 Jan 2016 09:24:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: sapi/fpm/fpm/ fpm_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90780@lists.php.net to get a copy of this message | ||
Commit: c0802af52c14172197f381988a5ba7d95cc43384
Author: Remi Collet <remi@php.net> Fri, 29 Jan 2016 10:24:15 +0100
Parents: 9599acdef6262842b1419acb93543ec8f4dfd593 a81cb64a96a824be8c6a02a45f6e6c16eca4604d
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c0802af52c14172197f381988a5ba7d95cc43384
Log:
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
Bugs:
https://bugs.php.net/62172
Changed paths:
MM sapi/fpm/fpm/fpm_main.c
Diff: