mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
This commit is contained in:
Adam Harvey 2013-12-03 14:51:03 -08:00
commit 6f52f566f3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -17,6 +17,9 @@ PHP NEWS
. Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML()
Produces invalid Markup). (Mike) Produces invalid Markup). (Mike)
- Filter:
. Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam)
- Sockets: - Sockets:
. Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe) . Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe)

2
ext/filter/logical_filters.c
View File

@ -715,8 +715,6 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
if ( if (
(ip[0] == 0) || (ip[0] == 0) ||
(ip[0] == 100 && (ip[1] >= 64 && ip[1] <= 127)) || (ip[0] == 100 && (ip[1] >= 64 && ip[1] <= 127)) ||
(ip[0] == 128 && ip[1] == 0) ||
(ip[0] == 191 && ip[1] == 255) ||
(ip[0] == 169 && ip[1] == 254) || (ip[0] == 169 && ip[1] == 254) ||
(ip[0] == 192 && ip[1] == 0 && ip[2] == 2) || (ip[0] == 192 && ip[1] == 0 && ip[2] == 2) ||
(ip[0] == 127 && ip[1] == 0 && ip[2] == 0 && ip[3] == 1) || (ip[0] == 127 && ip[1] == 0 && ip[2] == 0 && ip[3] == 1) ||

4
ext/filter/tests/bug53150.phpt
View File

@ -23,6 +23,6 @@ string(3) "::1"
bool(false) bool(false)
bool(false) bool(false)
string(9) "128.0.0.1" string(9) "128.0.0.1"
bool(false) string(9) "128.0.0.1"
string(11) "191.255.0.0"
string(11) "191.255.0.0" string(11) "191.255.0.0"
bool(false)