diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:11:13 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:11:13 +0100 |
| commit | 6eab2b910120e0ff5f0cdbbeac9be02e13312497 (patch) | |
| tree | 08d7517c71e5726cda6cb3b5f9cfd37f900f6b5d /sapi/phpdbg/phpdbg_prompt.c | |
| parent | cc91072f0ef69b5884f23eb758ef6e12e8858034 (diff) | |
| parent | b4db856d374d0df47e902b65639ab9a06346aa8a (diff) | |
| download | php-git-6eab2b910120e0ff5f0cdbbeac9be02e13312497.tar.gz | |
Merge phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 5e2cc03d50..73ecbcb892 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -653,6 +653,10 @@ PHPDBG_COMMAND(run) /* {{{ */ EG(opline_ptr) = orig_opline; EG(return_value_ptr_ptr) = orig_retval_ptr; + if (PHPDBG_G(flags) & PHPDBG_IS_QUITTING) { + zend_bailout(); + } + if (!(PHPDBG_G(flags) & PHPDBG_IS_STOPPING)) { phpdbg_error("stop", "type=\"bailout\"", "Caught exit/error from VM"); restore = 0; @@ -1143,6 +1147,7 @@ PHPDBG_COMMAND(quit) /* {{{ */ /* don't allow this to loop, ever ... */ if (!(PHPDBG_G(flags) & PHPDBG_IS_STOPPING)) { PHPDBG_G(flags) |= PHPDBG_IS_QUITTING; + PHPDBG_G(flags) &= ~(PHPDBG_IS_RUNNING | PHPDBG_IS_CLEANING); zend_bailout(); } @@ -1438,7 +1443,7 @@ void phpdbg_execute_ex(zend_op_array *op_array TSRMLS_DC) /* {{{ */ } #endif - if ((PHPDBG_G(flags) & (PHPDBG_IS_STOPPING | PHPDBG_IS_RUNNING)) == PHPDBG_IS_STOPPING) { + if ((PHPDBG_G(flags) & PHPDBG_IS_STOPPING) && !(PHPDBG_G(flags) & PHPDBG_IS_RUNNING)) { zend_bailout(); } |