com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/filter/lo gical_filters.c ext/filter/tests/filter_ipv4_rfc6 890.phpt

From: Date: Mon, 05 Sep 2016 08:13:19 +0000
Subject: com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/filter/lo gical_filters.c ext/filter/tests/filter_ipv4_rfc6 890.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94317@lists.php.net to get a copy of this message
Commit: 376dcaa39a76417488ee08826f321178b2d12152 Author: Julien Pauli <jpauli@php.net> Mon, 5 Sep 2016 10:13:19 +0200 Parents: f203de0748742261658a7f7007d000beeb4c815a e5047ac2d2a31f9a9fb2593d364feb0d1e407442 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=376dcaa39a76417488ee08826f321178b2d12152 Log: 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 Bugs: https://bugs.php.net/72972 Changed paths: MM ext/filter/logical_filters.c MM ext/filter/tests/filter_ipv4_rfc6890.phpt Diff: diff --cc ext/filter/tests/filter_ipv4_rfc6890.phpt index 199edc5,b1920c7..157de77 --- 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)

« previous php.cvs (#94317) next »