summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-07-08 16:31:53 +0200
committerJulien Pauli <jpauli@php.net>2016-07-08 16:31:53 +0200
commit13a5c5406810eb1ce55616fb2cedb50112665bbc (patch)
tree7a216cacf9fb3bd54482c239206e419d5e1c3bc8 /sapi/cli/php_cli_server.c
parent8db64e919c7c261a429ad33254b600601935b2ac (diff)
parent51d19891a418754df6e1a8f7c7312e6bc20ac449 (diff)
downloadphp-git-13a5c5406810eb1ce55616fb2cedb50112665bbc.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Updated NEWS update filter_var filters for ipv4 addresses to reflect rfc6890
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions