diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-02-13 22:20:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-02-13 22:20:39 +0300 |
| commit | e10e151e9b92313a7085272c85bebf6c82017fce (patch) | |
| tree | 6cac4100536c5e25143c55d1ab6b2f3b3dc81cf9 /sapi/phpdbg/phpdbg_wait.c | |
| parent | bc630ad6da0c6d7cf2d224dba8972499d5691c6b (diff) | |
| download | php-git-e10e151e9b92313a7085272c85bebf6c82017fce.tar.gz | |
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.
Diffstat (limited to 'sapi/phpdbg/phpdbg_wait.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index 821b848443..480c22c67b 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -28,7 +28,7 @@ static void phpdbg_rebuild_http_globals_array(int type, const char *name) { if (Z_TYPE(PG(http_globals)[type]) != IS_UNDEF) { zval_dtor(&PG(http_globals)[type]); } - if ((zvp = zend_hash_str_find(&EG(symbol_table).ht, name, strlen(name)))) { + if ((zvp = zend_hash_str_find(&EG(symbol_table), name, strlen(name)))) { Z_ADDREF_P(zvp); PG(http_globals)[type] = *zvp; } @@ -157,7 +157,7 @@ void phpdbg_webdata_decompress(char *msg, int len) { PG(auto_globals_jit) = 0; zend_hash_apply(CG(auto_globals), (apply_func_t) phpdbg_dearm_autoglobals); - zend_hash_clean(&EG(symbol_table).ht); + zend_hash_clean(&EG(symbol_table)); EG(symbol_table) = *Z_ARR_P(zvp); /* Rebuild cookies, env vars etc. from GLOBALS (PG(http_globals)) */ |