com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/json/tests/bug54484.phpt ext/json/tests/pass003.phpt

From: Date: Sun, 15 Nov 2015 19:13:49 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/json/tests/bug54484.phpt ext/json/tests/pass003.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89857@lists.php.net to get a copy of this message
Commit: 3c320199896c63b2471cd832c7585744ef13f2eb Author: Jakub Zelenka <bukka@php.net> Sun, 15 Nov 2015 19:13:49 +0000 Parents: 7819fef345f2ec80c4fea804b350e229af589990 e5abc53701ba5a9b58dfaba3b59881c9c410a8e7 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3c320199896c63b2471cd832c7585744ef13f2eb Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM ext/json/tests/bug54484.phpt MM ext/json/tests/pass003.phpt Diff: diff --cc ext/json/tests/bug54484.phpt index 897c655,3a38475..f70b96e --- a/ext/json/tests/bug54484.phpt +++ b/ext/json/tests/bug54484.phpt @@@ -13,12 -13,6 +13,9 @@@ var_dump(json_last_error()) json_decode("invalid json"); var_dump(json_last_error()); - +json_decode("\"\001 invalid json\""); +var_dump(json_last_error()); + - json_decode(""); var_dump(json_last_error()); ?>

« previous php.cvs (#89857) next »