com php-src: fix test outputs: ext/fileinfo/tests/bug68735.phpt ext/fileinfo/tests/cve-2014-1943.phpt ext/fileinfo/tests/finfo _file_regex.phpt
ext/fileinfo/tests/precedural_finfo _in_method.phpt

From: Date: Sun, 08 Mar 2015 18:47:34 +0000
Subject: com php-src: fix test outputs: ext/fileinfo/tests/bug68735.phpt ext/fileinfo/tests/cve-2014-1943.phpt ext/fileinfo/tests/finfo _file_regex.phpt
ext/fileinfo/tests/precedural_finfo _in_method.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85346@lists.php.net to get a copy of this message
Commit: 332bbfa23ba5aaf0f0080c5f3ee912c890ab9a5e Author: Anatol Belski <ab@php.net> Sun, 8 Mar 2015 13:16:28 +0100 Parents: 9603f16f995154a858d7e0b31eff3a9b79f88ff7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=332bbfa23ba5aaf0f0080c5f3ee912c890ab9a5e Log: fix test outputs Changed paths: M ext/fileinfo/tests/bug68735.phpt M ext/fileinfo/tests/cve-2014-1943.phpt M ext/fileinfo/tests/finfo_file_regex.phpt M ext/fileinfo/tests/precedural_finfo_in_method.phpt Diff: diff --git a/ext/fileinfo/tests/bug68735.phpt b/ext/fileinfo/tests/bug68735.phpt index f86109c..03e9a42 100644 --- a/ext/fileinfo/tests/bug68735.phpt +++ b/ext/fileinfo/tests/bug68735.phpt @@ -12,5 +12,5 @@ Bug #68735 fileinfo out-of-bounds memory access ?> ===DONE=== --EXPECTF-- -string(%d) "JPEG image data, JFIF standard 1.01, comment: "%S"" +string(%d) "JPEG image data, JFIF standard 1.01, resolution (DPI), density 180x52, segment length 16, comment: "%S"" ===DONE=== diff --git a/ext/fileinfo/tests/cve-2014-1943.phpt b/ext/fileinfo/tests/cve-2014-1943.phpt index b2e9c17..f4dddda 100644 --- a/ext/fileinfo/tests/cve-2014-1943.phpt +++ b/ext/fileinfo/tests/cve-2014-1943.phpt @@ -34,6 +34,6 @@ Done --EXPECTF-- string(%d) "%s" -Warning: finfo_file(): Failed identify data 0:(null) in %s on line %d +Warning: finfo_file(): Failed identify data 0:indirect recursion nesting (%d) exceeded in %s on line %d bool(false) Done diff --git a/ext/fileinfo/tests/finfo_file_regex.phpt b/ext/fileinfo/tests/finfo_file_regex.phpt index 7d9cd3a..ee582b5 100644 --- a/ext/fileinfo/tests/finfo_file_regex.phpt +++ b/ext/fileinfo/tests/finfo_file_regex.phpt @@ -25,5 +25,5 @@ var_dump( finfo_file( $finfo, $file, FILEINFO_CONTINUE ) ); --EXPECTF-- *** Testing finfo_file() : regex rules *** string(28) "text/plain; charset=us-ascii" -string(22) "awk script, ASCII text" +string(30) "awk or perl script, ASCII text" ===DONE=== diff --git a/ext/fileinfo/tests/precedural_finfo_in_method.phpt b/ext/fileinfo/tests/precedural_finfo_in_method.phpt index 8c30b8a..8495d4c 100644 --- a/ext/fileinfo/tests/precedural_finfo_in_method.phpt +++ b/ext/fileinfo/tests/precedural_finfo_in_method.phpt @@ -15,4 +15,4 @@ $test->method(); ?> --EXPECT-- -string(28) "text/plain; charset=us-ascii" +string(28) "text/x-php; charset=us-ascii"

« previous php.cvs (#85346) next »