Skip to content

Commit f2fdcfc

Browse files
committed
These were 6bone experimental network allocations, which have been returned to IANA (RFC 3701)
1 parent 160a4a6 commit f2fdcfc

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

ext/filter/logical_filters.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -954,10 +954,9 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
954954
if (flags & FILTER_FLAG_NO_RES_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
955955
if (
956956
(ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0 && ip[4] == 0 && ip[5] == 0 && ip[6] == 0 && (ip[7] == 0 || ip[7] == 1)) ||
957-
(ip[0] == 0x5f) ||
958957
(ip[0] >= 0xfe80 && ip[0] <= 0xfebf) ||
959-
(ip[0] == 0x2001 && (ip[1] == 0x0db8 || (ip[1] >= 0x0010 && ip[1] <= 0x001f))) ||
960-
(ip[0] == 0x3ff3)
958+
(ip[0] == 0x2001 && (ip[1] == 0x0db8 || (ip[1] >= 0x0010 && ip[1] <= 0x001f)))
959+
961960
) {
962961
RETURN_VALIDATION_FAILED
963962
}

ext/filter/tests/bug47435.phpt

-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ var_dump(filter_var("2001:0010::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
1818
var_dump(filter_var("2001:0010::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE));
1919
var_dump(filter_var("240b:0010::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
2020
var_dump(filter_var("240b:0010::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE));
21-
var_dump(filter_var("5f::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
22-
var_dump(filter_var("5f::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE));
23-
var_dump(filter_var("3ff3::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
24-
var_dump(filter_var("3ff3::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE));
2521
?>
2622
--EXPECT--
2723
string(7) "FC00::1"
@@ -38,7 +34,3 @@ string(12) "2001:0010::1"
3834
bool(false)
3935
string(12) "240b:0010::1"
4036
string(12) "240b:0010::1"
41-
string(5) "5f::1"
42-
bool(false)
43-
string(7) "3ff3::1"
44-
bool(false)

0 commit comments

Comments
 (0)