diff options
| author | David Soria Parra <dsp@php.net> | 2013-09-17 09:55:03 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2013-09-17 09:55:03 +0200 |
| commit | 5e3da04fb033734d2e69542fe835660c0df8dc48 (patch) | |
| tree | 924072c22a4964f4ac68068277d8464aad394e01 | |
| parent | 3d6ac70e6652c2c15b180e3f34fdc061e47f68a4 (diff) | |
| parent | dfd7d1063a5292b04f6134284337550f4f513749 (diff) | |
| download | php-git-5e3da04fb033734d2e69542fe835660c0df8dc48.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
| -rw-r--r-- | ext/filter/logical_filters.c | 1 | ||||
| -rw-r--r-- | ext/filter/tests/018.phpt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 9a26cc65d9..0e3297bd8d 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -714,6 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ if (flags & FILTER_FLAG_NO_RES_RANGE) { if ( (ip[0] == 0) || + (ip[0] == 100 && (ip[1] == 0 || ip[1] <= 127)) || (ip[0] == 128 && ip[1] == 0) || (ip[0] == 191 && ip[1] == 255) || (ip[0] == 169 && ip[1] == 254) || diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt index af52b2e60d..9c73fc3cfc 100644 --- a/ext/filter/tests/018.phpt +++ b/ext/filter/tests/018.phpt @@ -15,6 +15,8 @@ var_dump(filter_var("192.168.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)); var_dump(filter_var("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); var_dump(filter_var("192.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); +var_dump(filter_var("100.0.0.0", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); +var_dump(filter_var("100.127.255.255", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP)); var_dump(filter_var("256.1237.123.1", FILTER_VALIDATE_IP)); var_dump(filter_var("255.255.255.255", FILTER_VALIDATE_IP)); @@ -40,6 +42,8 @@ bool(false) string(12) "192.0.34.166" bool(false) string(9) "192.0.0.1" +bool(false) +bool(false) string(12) "192.0.34.166" bool(false) string(15) "255.255.255.255" |