]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJulien Pauli <jpauli@php.net>
Mon, 5 Sep 2016 08:13:19 +0000 (10:13 +0200)
committerJulien Pauli <jpauli@php.net>
Mon, 5 Sep 2016 08:13:19 +0000 (10:13 +0200)
* PHP-7.0:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE

1  2 
ext/filter/logical_filters.c
ext/filter/tests/filter_ipv4_rfc6890.phpt

Simple merge
index 199edc59fd39e663dc2c762bfb4e5a17e3d312ec,b1920c762d71c610f198c317f28b4f5da38160a6..157de778297f2e5c63fa26d22143395a9ab1b3eb
@@@ -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)