From: Julien Pauli <jpauli@php.net>
Date: Mon, 5 Sep 2016 08:13:19 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1337^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=376dcaa39a76417488ee08826f321178b2d12152;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
---

376dcaa39a76417488ee08826f321178b2d12152
diff --cc ext/filter/tests/filter_ipv4_rfc6890.phpt
index 199edc59fd,b1920c762d..157de77829
--- a/ext/filter/tests/filter_ipv4_rfc6890.phpt
+++ b/ext/filter/tests/filter_ipv4_rfc6890.phpt
@@@ -92,16 -92,13 +92,16 @@@ bool(false
  bool(false)
  string(14) "192.168.0.0/16"
  bool(false)
 +bool(false)
 +string(9) "0.0.0.0/8"
 +bool(false)
  bool(false)
  string(10) "10.0.0.0/8"
- bool(false)
- bool(false)
+ string(8) "10.0.0.0"
+ string(14) "10.255.255.255"
  string(12) "10.64.0.0/10"
- bool(false)
- bool(false)
+ string(10) "100.64.0.0"
+ string(15) "100.127.255.255"
  string(11) "127.0.0.0/8"
  bool(false)
  bool(false)