diff options
| author | Remi Collet <remi@php.net> | 2014-11-17 06:58:28 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-17 06:58:28 +0100 |
| commit | f22e0c0a6ad05805344d495ed33e8cbc8e56ebf5 (patch) | |
| tree | f429270bb62dd91e5ddc7afaa93cb990e83aff46 /sapi/cli/php_cli_server.c | |
| parent | 10a957ed3501d2005bfed7356036121384d9c52e (diff) | |
| parent | 4475cbdc8577ec704bf7d6a6c753e5e4066fec19 (diff) | |
| download | php-git-f22e0c0a6ad05805344d495ed33e8cbc8e56ebf5.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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