From e10e151e9b92313a7085272c85bebf6c82017fce Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 13 Feb 2015 22:20:39 +0300 Subject: Merged zend_array and HashTable into the single data structure. Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument. --- sapi/phpdbg/phpdbg_webdata_transfer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_webdata_transfer.c') diff --git a/sapi/phpdbg/phpdbg_webdata_transfer.c b/sapi/phpdbg/phpdbg_webdata_transfer.c index 10432c9fda..af5847c7f4 100644 --- a/sapi/phpdbg/phpdbg_webdata_transfer.c +++ b/sapi/phpdbg/phpdbg_webdata_transfer.c @@ -43,7 +43,7 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len) { phpdbg_is_auto_global(ZEND_STRL("_SERVER")); phpdbg_is_auto_global(ZEND_STRL("_REQUEST")); array_init(&zv[1]); - zend_hash_copy(Z_ARRVAL(zv[1]), &EG(symbol_table).ht, NULL); + zend_hash_copy(Z_ARRVAL(zv[1]), &EG(symbol_table), NULL); Z_ARRVAL(zv[1])->pDestructor = NULL; /* we're operating on a copy! Don't double free zvals */ zend_hash_str_del(Z_ARRVAL(zv[1]), ZEND_STRL("GLOBALS")); /* do not use the reference to itself in json */ zend_hash_str_add(ht, ZEND_STRL("GLOBALS"), &zv[1]); -- cgit v1.2.1