com php-src: Merge branch 'PHP-5.6': sapi/phpdbg/phpdbg_wait .c

From: Date: Wed, 29 Oct 2014 06:26:58 +0000
Subject: com php-src: Merge branch 'PHP-5.6': sapi/phpdbg/phpdbg_wait .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82835@lists.php.net to get a copy of this message
Commit: 770473a64827f8808c1ee4851cedb3371e60699d Author: Remi Collet <remi@php.net> Wed, 29 Oct 2014 07:26:58 +0100 Parents: 4fec48d1b0e1f5a11926fdd19a491d63c0ab9d2a 7dd871438fec9eaccf06c235faba1f51ff2967da Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=770473a64827f8808c1ee4851cedb3371e60699d Log: Merge branch 'PHP-5.6' * PHP-5.6: cleanup uneeded json Changed paths: MM sapi/phpdbg/phpdbg_wait.c Diff: diff --cc sapi/phpdbg/phpdbg_wait.c index 40cf004,95024b8..a8cf749 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@@ -22,16 -22,15 +22,15 @@@ #include "ext/standard/basic_functions.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg); - ZEND_EXTERN_MODULE_GLOBALS(json); static void phpdbg_rebuild_http_globals_array(int type, const char *name TSRMLS_DC) { - zval **zvpp; - if (PG(http_globals)[type]) { - zval_dtor(PG(http_globals)[type]); + zval *zvp; + if (Z_TYPE(PG(http_globals)[type]) != IS_UNDEF) { + zval_dtor(&PG(http_globals)[type]); } - if (zend_hash_find(&EG(symbol_table), name, strlen(name) + 1, (void **) &zvpp) == SUCCESS) { - Z_SET_REFCOUNT_PP(zvpp, 2); - PG(http_globals)[type] = *zvpp; + if ((zvp = zend_hash_str_find(&EG(symbol_table).ht, name, strlen(name)))) { + Z_ADDREF_P(zvp); + PG(http_globals)[type] = *zvp; } }

« previous php.cvs (#82835) next »