com php-src: Merge branch 'PHP-5.6': sapi/fpm/php-fpm.conf.in
| From: | Ferenc Kovacs | Date: | Fri, 03 Oct 2014 09:40:05 +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-82064@lists.php.net to get a copy of this message | ||
Commit: e13e305b932c5f8a3e73f61e7cd01dd591548c91
Author: Ferenc Kovacs <tyrael@php.net> Fri, 3 Oct 2014 11:40:05 +0200
Parents: 5c63a4f72bd618ff8260892347765d8b4375df98 79e05bf5578f09bb26e4a8826eb94f7f4601d4f6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e13e305b932c5f8a3e73f61e7cd01dd591548c91
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for previous commit
NEWS entry for previous commit
add IPv6 support to php-fpm
Changed paths:
MM sapi/fpm/php-fpm.conf.in
Diff: