com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_conf. c sapi/fpm/php-fpm.conf.in
| From: | Remi Collet | Date: | Sat, 22 Nov 2014 09:31:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fpm_conf. c sapi/fpm/php-fpm.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83232@lists.php.net to get a copy of this message | ||
Commit: 48fa36500670cc666edbf1e2902c16d16a72e375
Author: Remi Collet <remi@php.net> Sat, 22 Nov 2014 10:31:26 +0100
Parents: 134827dbd56d625de575760bc79db6c006946863 6b974874abe55622ed0d7610386467e6f348dc40
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=48fa36500670cc666edbf1e2902c16d16a72e375
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
minor typo in test
add test for global / pool prefix and bug #68478
Fixed Bug #68478 acess_log don't use prefix
Bugs:
https://bugs.php.net/68478
Changed paths:
MM sapi/fpm/fpm/fpm_conf.c
MM sapi/fpm/php-fpm.conf.in
Diff: