]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 17 Nov 2014 05:59:03 +0000 (06:59 +0100)
committerRemi Collet <remi@php.net>
Mon, 17 Nov 2014 05:59:03 +0000 (06:59 +0100)
commit2b1f90af2be0b68bdd012e83f3e994ed344ddd88
tree85516d6f7007891c86e137068dee0b712feed6ab
parent54fa42475120f3ab61f50732fa2d68c3af07f259
parentf22e0c0a6ad05805344d495ed33e8cbc8e56ebf5
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
sapi/fpm/fpm/fastcgi.c
sapi/fpm/php-fpm.conf.in