From: Greg Beaver <cellog@php.net>
Date: Tue, 20 May 2008 04:09:41 +0000 (+0000)
Subject: MFB relax rename requirements
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1719
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccf430ca933fda8699bbabd8c2980fc16c555f5f;p=php

MFB relax rename requirements
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index f910ec5f2b..f34c2ccf79 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1844,6 +1844,7 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c
 	char *error;
 	const char *pcr_error;
 	int ext_len = ext ? strlen(ext) : 0;
+	phar_archive_data **pphar;
 
 	if (!ext) {
 		if (phar->is_zip) {
@@ -1914,12 +1915,18 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c
 	efree(basepath);
 	efree(newname);
 
-	if (zend_hash_exists(&(PHAR_GLOBALS->phar_fname_map), newpath, phar->fname_len)) {
+	if (SUCCESS == zend_hash_exists(&(PHAR_GLOBALS->phar_fname_map), newpath, phar->fname_len, (void **) &pphar)) {
+		if (*pphar == phar) {
+			if (!zend_hash_num_elements(&phar->manifest)) {
+				goto its_ok;
+			}
+		}
 		efree(oldpath);
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Unable to add newly converted phar \"%s\" to the list of phars, a phar with that name already exists", phar->fname);
 		return NULL;
 	}
 
+its_ok:
 	if (!phar->is_data) {
 		if (SUCCESS != phar_detect_phar_fname_ext(newpath, phar->fname_len, (const char **) &(phar->ext), &(phar->ext_len), 1, 1, 1 TSRMLS_CC)) {
 			efree(oldpath);