diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-21 23:14:06 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-21 23:14:06 +0200 |
| commit | 447ec05f3160628ef6dc7f7eee34bae866af8e5c (patch) | |
| tree | b07a8ade490b4c991b2cff10940f25b6e9eb9b9b | |
| parent | c1e12316f1126ae3b3867a38d6930cf66cfb0675 (diff) | |
| download | php-git-447ec05f3160628ef6dc7f7eee34bae866af8e5c.tar.gz | |
Fixed infinite loop when quitting (sometimes)
| -rw-r--r-- | phpdbg_prompt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index e2603a00ed..7a28a75129 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -920,7 +920,7 @@ PHPDBG_COMMAND(quit) /* {{{ */ zend_bailout(); } - return SUCCESS; + return PHPDBG_NEXT; } /* }}} */ PHPDBG_COMMAND(clean) /* {{{ */ @@ -1048,7 +1048,7 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */ case PHPDBG_FINISH: case PHPDBG_UNTIL: case PHPDBG_NEXT: { - if (!EG(in_execution)) { + if (!EG(in_execution) && !(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) { phpdbg_error("Not running"); } goto out; |