diff options
| author | Anatol Belski <ab@php.net> | 2016-09-23 11:25:33 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-23 11:25:33 +0200 |
| commit | 8f256bebef344634b6ca0bc5fac03b614ffb79c3 (patch) | |
| tree | 918c622bb8e22c3b1535f4076dcba17261a80aa1 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | f7e5481a10ce0b4041893ed298f89574ab07e27d (diff) | |
| parent | 9ee913a773767de678ba0898861b25aefa48ad1b (diff) | |
| download | php-git-8f256bebef344634b6ca0bc5fac03b614ffb79c3.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
phpdbg next command must stop when leaving function
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index b19739ed34..2a75dedc67 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1535,12 +1535,18 @@ ex_is_caught: goto next; } + /* not while in conditionals */ + phpdbg_print_opline_ex(execute_data, 0); + /* perform seek operation */ if ((PHPDBG_G(flags) & PHPDBG_SEEK_MASK) && !(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) { /* current address */ zend_ulong address = (zend_ulong) execute_data->opline; if (PHPDBG_G(seek_ex) != execute_data) { + if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) { + goto stepping; + } goto next; } @@ -1584,10 +1590,8 @@ ex_is_caught: } } - /* not while in conditionals */ - phpdbg_print_opline_ex(execute_data, 0); - if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING && (PHPDBG_G(flags) & PHPDBG_STEP_OPCODE || execute_data->opline->lineno != PHPDBG_G(last_line))) { +stepping: PHPDBG_G(flags) &= ~PHPDBG_IS_STEPPING; DO_INTERACTIVE(1); } |