cellog Sat Jan 12 16:15:16 2008 UTC
Modified files:
/pecl/phar phar.c tar.c
Log:
add definitions for MAX_WBITS in case it isn't defined
http://cvs.php.net/viewvc.cgi/pecl/phar/phar.c?r1=1.266&r2=1.267&diff_format=u
Index: pecl/phar/phar.c
diff -u pecl/phar/phar.c:1.266 pecl/phar/phar.c:1.267
--- pecl/phar/phar.c:1.266 Sat Jan 12 05:17:11 2008
+++ pecl/phar/phar.c Sat Jan 12 16:15:16 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar.c,v 1.266 2008/01/12 05:17:11 cellog Exp $ */
+/* $Id: phar.c,v 1.267 2008/01/12 16:15:16 cellog Exp $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -1672,6 +1672,10 @@
MAPPHAR_ALLOC_FAIL("unable to decompress gzipped phar archive \"%s\" to temporary file, enable zlib extension in php.ini")
}
array_init(&filterparams);
+/* this is defined in zlib's zconf.h */
+#ifndef MAX_WBITS
+#define MAX_WBITS 15
+#endif
add_assoc_long(&filterparams, "window", MAX_WBITS + 32);
/* entire file is gzip-compressed, uncompress to temporary file */
if (!(temp = php_stream_fopen_tmpfile())) {
@@ -3302,7 +3306,7 @@
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHAR_EXT_VERSION_STR);
php_info_print_table_row(2, "Phar API version", PHAR_API_VERSION_STR);
- php_info_print_table_row(2, "CVS revision", "$Revision: 1.266 $");
+ php_info_print_table_row(2, "CVS revision", "$Revision: 1.267 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
#if HAVE_PHAR_ZIP
http://cvs.php.net/viewvc.cgi/pecl/phar/tar.c?r1=1.12&r2=1.13&diff_format=u
Index: pecl/phar/tar.c
diff -u pecl/phar/tar.c:1.12 pecl/phar/tar.c:1.13
--- pecl/phar/tar.c:1.12 Sat Jan 12 04:32:17 2008
+++ pecl/phar/tar.c Sat Jan 12 16:15:16 2008
@@ -571,6 +571,10 @@
zval filterparams;
array_init(&filterparams);
+/* this is defined in zlib's zconf.h */
+#ifndef MAX_WBITS
+#define MAX_WBITS 15
+#endif
add_assoc_long(&filterparams, "window", MAX_WBITS + 16);
filter = php_stream_filter_create("zlib.deflate", &filterparams, php_stream_is_persistent(phar->fp) TSRMLS_CC);
zval_dtor(&filterparams);
|