com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_conf.c
| From: | Remi Collet | Date: | Fri, 21 Nov 2014 06:35:10 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_conf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83207@lists.php.net to get a copy of this message | ||
Commit: 61f6cd0da56e36de9d682159d0f58894d950b6f8
Author: Remi Collet <remi@php.net> Fri, 21 Nov 2014 07:35:10 +0100
Parents: 245d01892a517f9e4600d2db1cdae1dc3213c4e3 cf3a90228644455f93ff96eddf2e27e9e5a8c812
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=61f6cd0da56e36de9d682159d0f58894d950b6f8
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #68391 Returns the pool config files in order
Bugs:
https://bugs.php.net/68391
Changed paths:
MM sapi/fpm/fpm/fpm_conf.c
Diff: