X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fencodings.phpt;h=98672bf12a20f0414846222b15a6fe4721e5da5f;hb=dbc4ec02cd319000b5c8589910047cfe6d5738be;hp=e66eabd8f9298752414a3a34e5caaafd80c92605;hpb=6541b0935ad5edc8e45b4a99c5e3f67812489bca;p=m6w6%2Fext-http

diff --git a/tests/encodings.phpt b/tests/encodings.phpt
index e66eabd..98672bf 100644
--- a/tests/encodings.phpt
+++ b/tests/encodings.phpt
@@ -3,12 +3,13 @@ encodings
 --SKIPIF--
 <?php
 include 'skip.inc';
-skipif(!function_exists('http_gzencode'), 'need zlib');
+skipif(!function_exists('http_deflate'), 'need zlib');
 ?>
 --FILE--
 <?php
 echo "-TEST\n";
 
+set_time_limit(0);
 error_reporting(E_ALL);
 
 $s = '';
@@ -18,29 +19,20 @@ for ($i = 0; $i < 1000000; $i++) {
 	$s .= chr(rand(0,255));
 }
 
-/* cannot test ext/zlib against this generated data, 
-   because it will fail with such widely differing binary data */
-
-var_dump($s == http_gzdecode(http_gzencode($s)));
-var_dump($s == http_inflate(http_deflate($s)));
-var_dump($s == http_uncompress(http_compress($s)));
-
-
-$s = "A simple test string, which won't blow up ext/zlib.\n";
-
-var_dump($s == http_gzdecode(gzencode($s)));
-var_dump($s == http_inflate(gzdeflate($s)));
-var_dump($s == http_uncompress(gzcompress($s)));
-
-/* no gzdecode in ext/zlib
-var_dump($s == gzdecode(http_gzencode($s))); */
-var_dump($s == gzinflate(http_deflate($s)));
-var_dump($s == gzuncompress(http_compress($s)));
+var_dump($s == http_inflate(http_deflate($s, HTTP_DEFLATE_TYPE_ZLIB)));
+var_dump($s == http_inflate(http_deflate($s, HTTP_DEFLATE_TYPE_GZIP)));
+var_dump($s == http_inflate(http_deflate($s, HTTP_DEFLATE_TYPE_RAW)));
 
 if (extension_loaded('zlib')) {
-	(gzencode($s) == http_gzencode($s)) or print "GZIP Failed\n";
-	(gzdeflate($s) == http_deflate($s)) or print "DEFLATE Failed\n";
-	(gzcompress($s) == http_compress($s)) or print "COMPRESS Failed\n";
+	
+	$s = "A simple test string, which won't blow up ext/zlib.\n";
+	
+	($s == http_inflate(gzencode($s))) or print "GZIP Failed\n";
+	($s == http_inflate(gzdeflate($s))) or print "DEFLATE Failed\n";
+	($s == http_inflate(gzcompress($s))) or print "COMPRESS Failed\n";
+	
+	($s == gzinflate(http_deflate($s, HTTP_DEFLATE_TYPE_RAW))) or print "INFLATE Failed\n";
+	($s == gzuncompress(http_deflate($s, HTTP_DEFLATE_TYPE_ZLIB))) or print "UNCOMPRESS Failed\n";
 }
 
 echo "Done\n";
@@ -50,9 +42,4 @@ echo "Done\n";
 bool(true)
 bool(true)
 bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
 Done