com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fastcgi.c sapi/fpm/php-fpm.conf.in
| From: | Remi Collet | Date: | Mon, 17 Nov 2014 05:59:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/fpm/fpm/fastcgi.c sapi/fpm/php-fpm.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83110@lists.php.net to get a copy of this message | ||
Commit: 2b1f90af2be0b68bdd012e83f3e994ed344ddd88
Author: Remi Collet <remi@php.net> Mon, 17 Nov 2014 06:59:03 +0100
Parents: 54fa42475120f3ab61f50732fa2d68c3af07f259 f22e0c0a6ad05805344d495ed33e8cbc8e56ebf5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b1f90af2be0b68bdd012e83f3e994ed344ddd88
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
comment about ipv4-mapped in fpm conf
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
Bugs:
https://bugs.php.net/68421
Changed paths:
MM sapi/fpm/fpm/fastcgi.c
MM sapi/fpm/php-fpm.conf.in
Diff: