From: Steph Fox Date: Fri, 20 Jun 2008 12:21:32 +0000 (+0000) Subject: The only reason that particular 'real solution' wasn't applied in the first place... X-Git-Tag: php-5.3.0alpha1~700 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc08a7cc2f70973314a0b4f5b4085446337948df;p=php 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 --- diff --git a/ext/phar/phar.c b/ext/phar/phar.c index ccec14f960..af9fba71a8 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -115,7 +115,7 @@ static void phar_split_cache_list(TSRMLS_D) /* 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"));