summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-11-17 06:59:03 +0100
committerRemi Collet <remi@php.net>2014-11-17 06:59:03 +0100
commit2b1f90af2be0b68bdd012e83f3e994ed344ddd88 (patch)
tree85516d6f7007891c86e137068dee0b712feed6ab /sapi/cli/php_cli_server.c
parent54fa42475120f3ab61f50732fa2d68c3af07f259 (diff)
parentf22e0c0a6ad05805344d495ed33e8cbc8e56ebf5 (diff)
downloadphp-git-2b1f90af2be0b68bdd012e83f3e994ed344ddd88.tar.gz
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
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions