From: Edin Kadribasic <edink@php.net>
Date: Sun, 11 Dec 2005 21:23:35 +0000 (+0000)
Subject: Use php5 built-in zlib. Unfortunatelly we don't export zError() there
X-Git-Tag: RELEASE_1_0_4~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48f4c97b8c2a97a26c9a5ebee906346df399be04;p=php

Use php5 built-in zlib. Unfortunatelly we don't export zError() there
so I habe generic "compression error" will suffice.
---

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index f6fa461c46..58791a3a7e 100644
--- a/ext/phar/config.w32
+++ b/ext/phar/config.w32
@@ -6,6 +6,9 @@ ARG_ENABLE("phar", "enable phar support", "no");
 if (PHP_PHAR != "no") {
 	if (PHP_ZLIB != "no") {
 		EXTENSION("phar", "phar.c");
+		if (!PHP_ZLIB_SHARED) {
+			AC_DEFINE("HAVE_PHAR_ZLIB", 1, "ZLIB support in phar");
+		}
 	} else {
 		EXTENSION("phar", "phar.c", null, "/D ZLIB_EXPORTS");
 		AC_DEFINE("HAVE_PHAR_ZLIB", 1, "ZLIB support in phar");
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 99de4122bc..796af8733d 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -661,7 +661,7 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
 			efree(idata->file);
 			efree(idata);
 			efree(internal_file);
-			php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: %s", zError(status));
+			php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar compression error");
 			return NULL;
 		}
 #define PHAR_ZLIB_ERROR efree(savebuf);\