From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 21 Apr 2014 21:14:06 +0000 (+0200)
Subject: Fixed infinite loop when quitting (sometimes)
X-Git-Tag: php-5.6.0beta2~1^2~37^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=447ec05f3160628ef6dc7f7eee34bae866af8e5c;p=php

Fixed infinite loop when quitting (sometimes)
---

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;