diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-18 19:49:30 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-18 19:49:30 -0700 |
| commit | d5ba2d8a99653521ff6a7997bf9aabe2b016c89a (patch) | |
| tree | 047a7e85353034be8dde0ee86b374e0f6e568411 /sapi/cli/php_cli_server.c | |
| parent | 7bb8cbcdeed009d9d34ff9ec83ecdd10c3d81c73 (diff) | |
| parent | 7a24ee13ec74bf3e85970e59dd69db8034ff434c (diff) | |
| download | php-git-d5ba2d8a99653521ff6a7997bf9aabe2b016c89a.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions