cvs: php-src /ext/phar stream.c

sfox Fri Aug 1 16:28:19 2008 UTC Modified files: /php-src/ext/phar stream.c Log: - Merge Dmitry's changes from PHP_5_3 branch http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.32&r2=1.33&diff_format=u Index: php-src/ext/phar/stream.c diff -u php-src/ext/phar/stream.c:1.32 php-src/ext/phar/stream.c:1.33 --- php-src/ext/phar/stream.c:1.32 Fri Aug 1 13:45:06 2008 +++ php-src/ext/phar/stream.c Fri Aug 1 16:28:19 2008 @@ -916,7 +916,11 @@ entry->filename_len = new_key_len; PHAR_ZSTR(new_str_key, new_key); +#if PHP_VERSION_ID < 50300 zend_hash_update_current_key_ex(&phar->manifest, key_type, new_key, new_key_len, 0, NULL); +#else + zend_hash_update_current_key_ex(&phar->manifest, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); +#endif efree(new_str_key); } } @@ -938,7 +942,11 @@ new_str_key[new_key_len] = 0; PHAR_ZSTR(new_str_key, new_key); +#if PHP_VERSION_ID < 50300 zend_hash_update_current_key_ex(&phar->virtual_dirs, key_type, new_key, new_key_len, 0, NULL); +#else + zend_hash_update_current_key_ex(&phar->virtual_dirs, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); +#endif efree(new_str_key); } } @@ -961,7 +969,11 @@ new_str_key[new_key_len] = 0; PHAR_ZSTR(new_str_key, new_key); +#if PHP_VERSION_ID < 50300 zend_hash_update_current_key_ex(&phar->mounted_dirs, key_type, new_key, new_key_len, 0, NULL); +#else + zend_hash_update_current_key_ex(&phar->mounted_dirs, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); +#endif efree(new_str_key); } }