make test more flexible to match different compressed strings

particurarly needed with zlib 1.2.11

diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
index 09207a583eaf6c3c03030cdcc56eebc106f31e19..c55d78d126c87311de2aa1b60efccf7ab1ae3592 100644 (file)
--- a/ext/zlib/tests/007.phpt
+++ b/ext/zlib/tests/007.phpt
@@ -41,11 +41,11 @@ bool(false)
 
 Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
-string(%d) "%s"
-string(%d) "%s"
+string(%d) "%a"
+string(%d) "%a"
 
 Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
-string(%d) "%s"
-string(%d) "%s"
+string(%d) "%a"
+string(%d) "%a"
 Done

diff --git a/ext/zlib/tests/bug51269.phpt b/ext/zlib/tests/bug51269.phpt
index 6b97bacf08462c134ad64de3117ac7a9af566dc7..89ad7b626983244ca5aabb9a532b0c39898efe27 100644 (file)
--- a/ext/zlib/tests/bug51269.phpt
+++ b/ext/zlib/tests/bug51269.phpt
@@ -14,7 +14,7 @@ header('Vary: Cookie');
 echo 'foo';
 ?>
 --EXPECTF--
-%s
+%a
 --EXPECTHEADERS--
 Vary: Cookie
 Content-Encoding: gzip

diff --git a/ext/zlib/tests/bug55544-win.phpt b/ext/zlib/tests/bug55544-win.phpt
index 03fd6b1c9084ea195235f55523c46482c76e8338..3f9843fc45dc00c68e2c0628d8d3194720f5568f 100644 (file)
Binary files a/ext/zlib/tests/bug55544-win.phpt and b/ext/zlib/tests/bug55544-win.phpt differ

diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt
index 7adda310494291a50c414b0538027b1c8be6be25..e46ee235230e82407a3b1fa7bc783aa529ad1133 100644 (file)
--- a/ext/zlib/tests/gzencode_variation2-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation2-win32.phpt
@@ -10,6 +10,11 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) {
 if (!extension_loaded("zlib")) {
        print "skip - ZLIB extension not loaded"; 
 }       
+
+include 'func.inc';
+if (version_compare(get_zlib_version(), "1.2.11") < 0) {
+       die("skip - at least zlib 1.2.11 required, got " . get_zlib_version());
+}
 ?> 
 --FILE--
 <?php
@@ -34,7 +39,7 @@ var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE)));
 *** Testing gzencode() : variation ***
 
 -- Testing with each encoding_mode  --
-string(90) "1f8b080000000000000b735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
-string(90) "1f8b080000000000000b735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
+string(90) "1f8b080000000000000a735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
+string(90) "1f8b080000000000000a735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000"
 string(66) "789c735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200735808cd"
 ===DONE===

diff --git a/ext/zlib/tests/ob_001.phpt b/ext/zlib/tests/ob_001.phpt
index b074a4f55b5f0f6644dea5367dad869f70496e0a..abf8ce34acf71baacf44012a6ea00c75e0863e5a 100644 (file)
--- a/ext/zlib/tests/ob_001.phpt
+++ b/ext/zlib/tests/ob_001.phpt
@@ -16,5 +16,5 @@ HTTP_ACCEPT_ENCODING=gzip
 echo "hi\n";
 ?>
 --EXPECTF--
-\1f\8b\b%s
+\1f\8b\b%a
 

diff --git a/ext/zlib/tests/ob_003.phpt b/ext/zlib/tests/ob_003.phpt
index 7142df7f0e305146431fe002872c1f373e9f5d43..f3b60883f4fcf4b1e12733a13a76b898bf1cac4a 100644 (file)
--- a/ext/zlib/tests/ob_003.phpt
+++ b/ext/zlib/tests/ob_003.phpt
@@ -17,7 +17,7 @@ ini_set("zlib.output_compression", 1);
 echo "hi\n";
 ?>
 --EXPECTF--
-\1f\8b\b%s
+\1f\8b\b%a
 --EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding

diff --git a/ext/zlib/tests/ob_004.phpt b/ext/zlib/tests/ob_004.phpt
index f5e6af552be71c449435a9fde072ceac1a7f2576..ecbc150c8956ed9768208aac849afa1d26b2081d 100644 (file)
--- a/ext/zlib/tests/ob_004.phpt
+++ b/ext/zlib/tests/ob_004.phpt
@@ -17,7 +17,7 @@ ob_start("ob_gzhandler");
 echo "hi\n";
 ?>
 --EXPECTF--
-\1f\8b\b%s
+\1f\8b\b%a
 --EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding