com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_conf. c
| From: | Remi Collet | Date: | Fri, 21 Nov 2014 06:37:05 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_conf. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83205@lists.php.net to get a copy of this message | ||
Commit: a849096c08eb9fd6c7aeb8c7218a64987edea9f1
Author: Remi Collet <remi@php.net> Fri, 21 Nov 2014 07:37:05 +0100
Parents: 9de44a29e0b60a359d53efd8752772405df29693 5234c2941f6fef488eea2bb625c0d5c88c2e6093
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a849096c08eb9fd6c7aeb8c7218a64987edea9f1
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
add test for #68391
NEWS
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: