From f258e9b803380e743e40ba45fd7cbd58442a25e8 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Wed, 22 Mar 2017 02:33:38 +0100
Subject: [PATCH] make test more flexible to match different compressed strings

particurarly needed with zlib 1.2.11
---
 ext/zlib/tests/007.phpt                       |   8 ++++----
 ext/zlib/tests/bug51269.phpt                  |   2 +-
 ext/zlib/tests/bug55544-win.phpt              | Bin 427 -> 579 bytes
 ext/zlib/tests/gzencode_variation2-win32.phpt |   9 +++++++--
 ext/zlib/tests/ob_001.phpt                    |   2 +-
 ext/zlib/tests/ob_003.phpt                    |   2 +-
 ext/zlib/tests/ob_004.phpt                    |   2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
index 09207a583e..c55d78d126 100644
--- 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 6b97bacf08..89ad7b6269 100644
--- 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
GIT binary patch
delta 164
zcmZ3@e3)gz+4{`9<ebu!R0Z|4(!69nAWz+zD>F?&qb#+kI5R&lJ~=<PAh9S_BR#bw
zzA7g(DIO}Jp{b*wWT<DPXK1LTsbHgEps7&J#hH?ss-aYzomrrutB_ctkdvBNT%rKd
orT|f@P?TC&npu>ZqN9+WU!tI-Afl&$Y4XGqGa0!iCoy^g0Mq?7$N&HU

delta 16
YcmX@ivYL6q*~zJlQy94?|6=q60647%LjV8(

diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt
index 7adda31049..e46ee23523 100644
--- 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 b074a4f55b..abf8ce34ac 100644
--- 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--
-‹%s
+‹%a
 
diff --git a/ext/zlib/tests/ob_003.phpt b/ext/zlib/tests/ob_003.phpt
index 7142df7f0e..f3b60883f4 100644
--- 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--
-‹%s
+‹%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 f5e6af552b..ecbc150c89 100644
--- 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--
-‹%s
+‹%a
 --EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding
-- 
2.50.1