diff options
Diffstat (limited to 'ext/phar/phar.c')
| -rw-r--r-- | ext/phar/phar.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index d4a5f3a3fe..e889a54fe3 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -82,7 +82,7 @@ ZEND_INI_MH(phar_ini_modify_handler) /* {{{ */ if (entry->name->len == sizeof("phar.readonly")-1) { PHAR_G(readonly) = ini; - if (PHAR_GLOBALS->request_init && PHAR_GLOBALS->phar_fname_map.arHash) { + if (PHAR_GLOBALS->request_init && PHAR_GLOBALS->phar_fname_map.u.flags) { zend_hash_apply_with_argument(&(PHAR_GLOBALS->phar_fname_map), phar_set_writeable_bit, (void *)&ini); } } else { @@ -146,9 +146,9 @@ finish_error: PHAR_GLOBALS->manifest_cached = 0; efree(tmp); zend_hash_destroy(&(PHAR_G(phar_fname_map))); - PHAR_GLOBALS->phar_fname_map.arHash = 0; + PHAR_GLOBALS->phar_fname_map.u.flags = 0; zend_hash_destroy(&(PHAR_G(phar_alias_map))); - PHAR_GLOBALS->phar_alias_map.arHash = 0; + PHAR_GLOBALS->phar_alias_map.u.flags = 0; zend_hash_destroy(&cached_phars); zend_hash_destroy(&cached_alias); zend_hash_graceful_reverse_destroy(&EG(regular_list)); @@ -173,8 +173,8 @@ finish_error: zend_hash_destroy(&cached_alias); cached_phars = PHAR_GLOBALS->phar_fname_map; cached_alias = PHAR_GLOBALS->phar_alias_map; - PHAR_GLOBALS->phar_fname_map.arHash = 0; - PHAR_GLOBALS->phar_alias_map.arHash = 0; + PHAR_GLOBALS->phar_fname_map.u.flags = 0; + PHAR_GLOBALS->phar_alias_map.u.flags = 0; zend_hash_graceful_reverse_destroy(&EG(regular_list)); memset(&EG(regular_list), 0, sizeof(HashTable)); efree(tmp); @@ -220,19 +220,19 @@ void phar_destroy_phar_data(phar_archive_data *phar) /* {{{ */ phar->signature = NULL; } - if (phar->manifest.arHash) { + if (phar->manifest.u.flags) { zend_hash_destroy(&phar->manifest); - phar->manifest.arHash = NULL; + phar->manifest.u.flags = 0; } - if (phar->mounted_dirs.arHash) { + if (phar->mounted_dirs.u.flags) { zend_hash_destroy(&phar->mounted_dirs); - phar->mounted_dirs.arHash = NULL; + phar->mounted_dirs.u.flags = 0; } - if (phar->virtual_dirs.arHash) { + if (phar->virtual_dirs.u.flags) { zend_hash_destroy(&phar->virtual_dirs); - phar->virtual_dirs.arHash = NULL; + phar->virtual_dirs.u.flags = 0; } if (Z_TYPE(phar->metadata) != IS_UNDEF) { @@ -3487,11 +3487,11 @@ PHP_RSHUTDOWN_FUNCTION(phar) /* {{{ */ { phar_release_functions(); zend_hash_destroy(&(PHAR_GLOBALS->phar_alias_map)); - PHAR_GLOBALS->phar_alias_map.arHash = NULL; + PHAR_GLOBALS->phar_alias_map.u.flags = 0; zend_hash_destroy(&(PHAR_GLOBALS->phar_fname_map)); - PHAR_GLOBALS->phar_fname_map.arHash = NULL; + PHAR_GLOBALS->phar_fname_map.u.flags = 0; zend_hash_destroy(&(PHAR_GLOBALS->phar_persist_map)); - PHAR_GLOBALS->phar_persist_map.arHash = NULL; + PHAR_GLOBALS->phar_persist_map.u.flags = 0; PHAR_GLOBALS->phar_SERVER_mung_list = 0; if (PHAR_GLOBALS->cached_fp) { |