com php-src: Merge branch 'PHP-5.6': sapi/fpm/php-fpm.conf.in
| From: | Remi Collet | Date: | Sun, 16 Nov 2014 17:01:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/fpm/php-fpm.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83107@lists.php.net to get a copy of this message | ||
Commit: 9e3ebd3a0d9919d75f526e2cef9bf35de8b4847f
Author: Remi Collet <remi@php.net> Sun, 16 Nov 2014 18:01:01 +0100
Parents: cac8e96738aa1557ad34f7221e547024ecaa52de 10a957ed3501d2005bfed7356036121384d9c52e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e3ebd3a0d9919d75f526e2cef9bf35de8b4847f
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
improve comments about FPM listen option
Changed paths:
MM sapi/fpm/php-fpm.conf.in
Diff: