From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 8 Nov 2006 16:02:29 +0000 (+0000)
Subject: HashTable copying optimization (Matt Wilmas)
X-Git-Tag: RELEASE_1_0_0RC1~1101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86c0ed37c865a934d70b5ffcf6675555ea948427;p=php

HashTable copying optimization (Matt Wilmas)
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index be2d770f9c..0345650af1 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -1005,7 +1005,7 @@ ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_fun
 		if (p->nKeyLength == 0) {
  			zend_hash_index_update(target, p->h, p->pData, size, &new_entry);
 		} else {
-			zend_u_hash_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->pData, size, &new_entry);
+			zend_u_hash_quick_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->h, p->pData, size, &new_entry);
 		}
 		if (pCopyConstructor) {
 			pCopyConstructor(new_entry);
@@ -1032,7 +1032,7 @@ ZEND_API void _zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_f
 				pCopyConstructor(t);
 			}
 		} else {
-			if (_zend_u_hash_add_or_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->pData, size, &t, mode ZEND_FILE_LINE_RELAY_CC)==SUCCESS && pCopyConstructor) {
+			if (_zend_u_hash_quick_add_or_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->h, p->pData, size, &t, mode ZEND_FILE_LINE_RELAY_CC)==SUCCESS && pCopyConstructor) {
 				pCopyConstructor(t);
 			}
 		}