- Merge Dmitry's changes from PHP_5_3 branch

diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index 7aecd8fb37c2b05ed00887cbbd13b651501686d7..3f2001d4bc80892c23fb25b1d53d7d82173b6d2b 100644 (file)
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -916,7 +916,11 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
                                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 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
                                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 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
                                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);
                        }
                }