]> granicus.if.org Git - php/commitdiff
Use php5 built-in zlib. Unfortunatelly we don't export zError() there
authorEdin Kadribasic <edink@php.net>
Sun, 11 Dec 2005 21:23:35 +0000 (21:23 +0000)
committerEdin Kadribasic <edink@php.net>
Sun, 11 Dec 2005 21:23:35 +0000 (21:23 +0000)
so I habe generic "compression error" will suffice.

ext/phar/config.w32
ext/phar/phar.c

index f6fa461c46dfebe691034030e40eac437ab6449b..58791a3a7e44b9f1c9ec3cbf85b3f35b70c74771 100644 (file)
@@ -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");
index 99de4122bc231b5cddb77d0e0119ebb4f4629c50..796af8733d2a769ca5bc6460bd75c73f49e60f58 100644 (file)
@@ -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);\