sfox Fri Jun 20 12:21:33 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c Log: The only reason that particular 'real solution' wasn't applied in the first place was that it also breaks the shared build Maybe we don't need to call a non-existent dtor if we're going to physically apply zend_hash_graceful_reverse_destroy()? - This works on my box, please test under *nix/OSX http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.24&r2=1.370.2.25&diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.24 php-src/ext/phar/phar.c:1.370.2.25 --- php-src/ext/phar/phar.c:1.370.2.24 Fri Jun 20 05:42:58 2008 +++ php-src/ext/phar/phar.c Fri Jun 20 12:21:32 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar.c,v 1.370.2.24 2008/06/20 05:42:58 cellog Exp $ */ +/* $Id: phar.c,v 1.370.2.25 2008/06/20 12:21:32 sfox Exp $ */ #define PHAR_MAIN 1 #include "phar_internal.h" @@ -115,7 +115,7 @@ /* fake request startup */ PHAR_GLOBALS->request_init = 1; - if (zend_hash_init(&EG(regular_list), 0, NULL, list_entry_destructor, 0) == SUCCESS) { + if (zend_hash_init(&EG(regular_list), 0, NULL, NULL, 0) == SUCCESS) { EG(regular_list).nNextFreeElement=1; /* we don't want resource id 0 */ } PHAR_G(has_bz2) = zend_hash_exists(&module_registry, "bz2", sizeof("bz2")); @@ -3406,7 +3406,7 @@ php_info_print_table_header(2, "Phar: PHP Archive support", "enabled"); php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION); php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION); - php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.24 $"); + php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.25 $"); php_info_print_table_row(2, "Phar-based phar archives", "enabled"); php_info_print_table_row(2, "Tar-based phar archives", "enabled"); php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php