com php-src: Remove phpdbg fix targeting 7.1 which landed in 7.0: sapi/phpdbg/phpdbg_list.c

From: Date: Wed, 05 Oct 2016 10:08:20 +0000
Subject: com php-src: Remove phpdbg fix targeting 7.1 which landed in 7.0: sapi/phpdbg/phpdbg_list.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94830@lists.php.net to get a copy of this message
Commit: eaff72f31b6322ff4b035b97af5ea1552b2281b7 Author: Bob Weinand <bobwei9@hotmail.com> Wed, 5 Oct 2016 12:08:20 +0200 Parents: 56e19b7c75b7a296705b63e29f183ad729800433 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eaff72f31b6322ff4b035b97af5ea1552b2281b7 Log: Remove phpdbg fix targeting 7.1 which landed in 7.0 Changed paths: M sapi/phpdbg/phpdbg_list.c Diff: diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list..c index 74d35c7..6895bea 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -316,17 +316,6 @@ zend_op_array *phpdbg_init_compile_file(zend_file_handle *file, int type) { dataptr = zend_hash_str_find_ptr(&PHPDBG_G(file_sources), filename, strlen(filename)); ZEND_ASSERT(dataptr != NULL); - if (op_array->vars) { - int i; - /* un-intern these strings to prevent zend_restore_strings from invalidating our string pointers too early */ - for (i = 0; i < op_array->last_var; i++) { - zend_string **s = op_array->vars + i; - if (ZSTR_IS_INTERNED(*s)) { - *s = zend_string_init(ZSTR_VAL(*s), ZSTR_LEN(*s), 0); - } - } - } - dataptr->op_array = *op_array; if (dataptr->op_array..refcount) { ++*dataptr->op_array.refcount;

« previous php.cvs (#94830) next »