From 9c21ed58b0b4f7340540c16dec4b0fb9c2051a09 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 21 Dec 2005 00:26:16 +0000
Subject: [PATCH 1/1] - remove debug code - fix encodings test

---
 http_encoding_api.c  |  1 -
 tests/encodings.phpt | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/http_encoding_api.c b/http_encoding_api.c
index 53c14d3..c05d3e8 100644
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -429,7 +429,6 @@ retry_raw_inflate:
 				}
 			break;
 		}
-		if (Z_BUF_ERROR == status) DebugBreak();
 	} while (Z_BUF_ERROR == status && ++max < HTTP_ENCODING_MAXTRY);
 	
 	STR_SET(*decoded, NULL);
diff --git a/tests/encodings.phpt b/tests/encodings.phpt
index 1b44ce5..98672bf 100644
--- a/tests/encodings.phpt
+++ b/tests/encodings.phpt
@@ -3,7 +3,7 @@ encodings
 --SKIPIF--
 <?php
 include 'skip.inc';
-skipif(!function_exists('http_gzencode'), 'need zlib');
+skipif(!function_exists('http_deflate'), 'need zlib');
 ?>
 --FILE--
 <?php
@@ -19,20 +19,20 @@ for ($i = 0; $i < 1000000; $i++) {
 	$s .= chr(rand(0,255));
 }
 
-var_dump($s == http_gzdecode(http_gzencode($s)));
-var_dump($s == http_inflate(http_deflate($s)));
-var_dump($s == http_inflate(http_deflate($s, -1, true)));
+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')) {
 	
 	$s = "A simple test string, which won't blow up ext/zlib.\n";
 	
-	($s == http_gzdecode(gzencode($s))) or print "GZIP Failed\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))) or print "INFLATE Failed\n";
-	($s == gzuncompress(http_deflate($s, -1, true))) or print "UNCOMPRESS 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";
-- 
2.30.2