From: Greg Beaver <cellog@php.net>
Date: Sat, 5 Jan 2008 22:48:06 +0000 (+0000)
Subject: remove mung server list hash destroy, this is done in shutdown
X-Git-Tag: RELEASE_2_0_0a1~1013
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd0d9e8de3b308d507b697475d4488dd0a4cfc98;p=php

remove mung server list hash destroy, this is done in shutdown
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index c003fc7aca..883c61affa 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -643,21 +643,15 @@ PHP_METHOD(Phar, mungServer)
 
 		if (SUCCESS != zend_hash_get_current_data(Z_ARRVAL_P(mungvalues), (void **) data)) {
 			zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "unable to retrieve array value in Phar::mungServer()");
-			zend_hash_destroy(&(PHAR_GLOBALS->phar_SERVER_mung_list));
-			PHAR_GLOBALS->phar_SERVER_mung_list.arBuckets = NULL;
 			return;
 		}
 		if (Z_TYPE_PP(*data) != IS_STRING) {
 			zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME");
-			zend_hash_destroy(&(PHAR_GLOBALS->phar_SERVER_mung_list));
-			PHAR_GLOBALS->phar_SERVER_mung_list.arBuckets = NULL;
 			return;
 		}
 		if (!php_self && Z_STRLEN_PP(*data) == sizeof("PHP_SELF")-1 && !strncmp(Z_STRVAL_PP(*data), "PHP_SELF", sizeof("PHP_SELF")-1)) {
 			if (SUCCESS != zend_hash_add_empty_element(&(PHAR_GLOBALS->phar_SERVER_mung_list), "PHP_SELF", sizeof("PHP_SELF")-1)) {
 				zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Unable to add PHP_SELF to Phar::mungServer() list of values to mung");
-				zend_hash_destroy(&(PHAR_GLOBALS->phar_SERVER_mung_list));
-				PHAR_GLOBALS->phar_SERVER_mung_list.arBuckets = NULL;
 				return;
 			}
 			php_self = 1;
@@ -666,8 +660,6 @@ PHP_METHOD(Phar, mungServer)
 			if (!request_uri && !strncmp(Z_STRVAL_PP(*data), "REQUEST_URI", sizeof("REQUEST_URI")-1)) {
 				if (SUCCESS != zend_hash_add_empty_element(&(PHAR_GLOBALS->phar_SERVER_mung_list), "REQUEST_URI", sizeof("REQUEST_URI")-1)) {
 					zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Unable to add REQUEST_URI to Phar::mungServer() list of values to mung");
-					zend_hash_destroy(&(PHAR_GLOBALS->phar_SERVER_mung_list));
-					PHAR_GLOBALS->phar_SERVER_mung_list.arBuckets = NULL;
 					return;
 				}
 				request_uri = 1;
@@ -675,8 +667,6 @@ PHP_METHOD(Phar, mungServer)
 			if (!script_name && !strncmp(Z_STRVAL_PP(*data), "SCRIPT_NAME", sizeof("SCRIPT_NAME")-1)) {
 				if (SUCCESS != zend_hash_add_empty_element(&(PHAR_GLOBALS->phar_SERVER_mung_list), "SCRIPT_NAME", sizeof("SCRIPT_NAME")-1)) {
 					zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Unable to add SCRIPT_NAME to Phar::mungServer() list of values to mung");
-					zend_hash_destroy(&(PHAR_GLOBALS->phar_SERVER_mung_list));
-					PHAR_GLOBALS->phar_SERVER_mung_list.arBuckets = NULL;
 					return;
 				}
 				script_name = 1;
@@ -685,8 +675,6 @@ PHP_METHOD(Phar, mungServer)
 		if (!script_filename && Z_STRLEN_PP(*data) == sizeof("SCRIPT_FILENAME")-1 && !strncmp(Z_STRVAL_PP(*data), "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME")-1)) {
 			if (SUCCESS != zend_hash_add_empty_element(&(PHAR_GLOBALS->phar_SERVER_mung_list), "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME")-1)) {
 				zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Unable to add SCRIPT_FILENAME to Phar::mungServer() list of values to mung");
-				zend_hash_destroy(&(PHAR_GLOBALS->phar_SERVER_mung_list));
-				PHAR_GLOBALS->phar_SERVER_mung_list.arBuckets = NULL;
 				return;
 			}
 			script_filename = 1;