diff options
| author | David Soria Parra <dsp@php.net> | 2013-09-18 14:28:57 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2013-09-18 14:28:57 +0200 |
| commit | 2eb566188625162644a186bcb6757f22978c54f9 (patch) | |
| tree | a665a41634cce9e90ca0e8968891d98ac5cb7ea6 | |
| parent | a34b141e08f02c34a100676080dddf7d9be84544 (diff) | |
| parent | 7e9044b6a251f40da1217c3265b83a9caae8bff8 (diff) | |
| download | php-git-2eb566188625162644a186bcb6757f22978c54f9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
RFC 6598 reserved ip range starts at 100.64.0.0
| -rw-r--r-- | ext/filter/logical_filters.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 0e3297bd8d..653cce23e6 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -714,7 +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] == 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) || |