From d1314893fd1325ca6aa0831101896e31135a2658 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Tue, 3 Dec 2013 14:46:15 -0800 Subject: [PATCH] Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list. These were returned to the general allocation pool by RFC 3330, and hence shouldn't cause an IP address validation failure due to being reserved. At least 128.0.0.0/16 is in use on the public Internet today. Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer). --- NEWS | 3 +++ ext/filter/logical_filters.c | 2 -- ext/filter/tests/bug53150.phpt | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 3b208985b9..c0379f82b3 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ PHP NEWS . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() Produces invalid Markup). (Mike) +- Filter: + . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam) + - XSL . Fixed bug #49634 (Segfault throwing an exception in a XSL registered function). (Mike) diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 03b00bd9f6..a38351d442 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -715,8 +715,6 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ if ( (ip[0] == 0) || (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] == 192 && ip[1] == 0 && ip[2] == 2) || (ip[0] == 127 && ip[1] == 0 && ip[2] == 0 && ip[3] == 1) || diff --git a/ext/filter/tests/bug53150.phpt b/ext/filter/tests/bug53150.phpt index 4baa4db772..4906888bdf 100644 --- a/ext/filter/tests/bug53150.phpt +++ b/ext/filter/tests/bug53150.phpt @@ -23,6 +23,6 @@ string(3) "::1" bool(false) bool(false) 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" -bool(false) -- 2.40.0