Skip to content

Commit f258e9b

Browse files
committed
make test more flexible to match different compressed strings
particurarly needed with zlib 1.2.11
1 parent 5096a42 commit f258e9b

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

ext/zlib/tests/007.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ bool(false)
4141

4242
Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
4343
bool(false)
44-
string(%d) "%s"
45-
string(%d) "%s"
44+
string(%d) "%a"
45+
string(%d) "%a"
4646

4747
Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
4848
bool(false)
49-
string(%d) "%s"
50-
string(%d) "%s"
49+
string(%d) "%a"
50+
string(%d) "%a"
5151
Done

ext/zlib/tests/bug51269.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ header('Vary: Cookie');
1414
echo 'foo';
1515
?>
1616
--EXPECTF--
17-
%s
17+
%a
1818
--EXPECTHEADERS--
1919
Vary: Cookie
2020
Content-Encoding: gzip

ext/zlib/tests/bug55544-win.phpt

152 Bytes
Binary file not shown.

ext/zlib/tests/gzencode_variation2-win32.phpt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) {
1010
if (!extension_loaded("zlib")) {
1111
print "skip - ZLIB extension not loaded";
1212
}
13+
14+
include 'func.inc';
15+
if (version_compare(get_zlib_version(), "1.2.11") < 0) {
16+
die("skip - at least zlib 1.2.11 required, got " . get_zlib_version());
17+
}
1318
?>
1419
--FILE--
1520
<?php
@@ -34,7 +39,7 @@ var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE)));
3439
*** Testing gzencode() : variation ***
3540

3641
-- Testing with each encoding_mode --
37-
string(90) "1f8b080000000000000b735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
38-
string(90) "1f8b080000000000000b735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
42+
string(90) "1f8b080000000000000a735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
43+
string(90) "1f8b080000000000000a735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
3944
string(66) "789c735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200735808cd"
4045
===DONE===

ext/zlib/tests/ob_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ HTTP_ACCEPT_ENCODING=gzip
1616
echo "hi\n";
1717
?>
1818
--EXPECTF--
19-
‹%s
19+
‹%a
2020

ext/zlib/tests/ob_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ini_set("zlib.output_compression", 1);
1717
echo "hi\n";
1818
?>
1919
--EXPECTF--
20-
‹%s
20+
‹%a
2121
--EXPECTHEADERS--
2222
Content-Encoding: gzip
2323
Vary: Accept-Encoding

ext/zlib/tests/ob_004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ob_start("ob_gzhandler");
1717
echo "hi\n";
1818
?>
1919
--EXPECTF--
20-
‹%s
20+
‹%a
2121
--EXPECTHEADERS--
2222
Content-Encoding: gzip
2323
Vary: Accept-Encoding

0 commit comments

Comments
 (0)