com php-src: Fixed infinite loop when quitting (sometimes): phpdbg_prompt.c
| From: | Bob Weinand | Date: | Mon, 21 Apr 2014 21:14:06 +0000 |
| Subject: | com php-src: Fixed infinite loop when quitting (sometimes): phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76972@lists.php.net to get a copy of this message | ||
Commit: 447ec05f3160628ef6dc7f7eee34bae866af8e5c
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 21 Apr 2014 23:14:06 +0200
Parents: c1e12316f1126ae3b3867a38d6930cf66cfb0675
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=447ec05f3160628ef6dc7f7eee34bae866af8e5c
Log:
Fixed infinite loop when quitting (sometimes)
Changed paths:
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index e2603a0..7a28a75 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;