From 332bbfa23ba5aaf0f0080c5f3ee912c890ab9a5e Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 8 Mar 2015 13:16:28 +0100 Subject: [PATCH] fix test outputs --- ext/fileinfo/tests/bug68735.phpt | 2 +- ext/fileinfo/tests/cve-2014-1943.phpt | 2 +- ext/fileinfo/tests/finfo_file_regex.phpt | 2 +- ext/fileinfo/tests/precedural_finfo_in_method.phpt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/fileinfo/tests/bug68735.phpt b/ext/fileinfo/tests/bug68735.phpt index f86109cb8f..03e9a4285f 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 b2e9c17c3f..f4dddda16c 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 7d9cd3adfa..ee582b5c52 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 8c30b8a197..8495d4cc1e 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" -- 2.40.0