From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 18 Jul 2015 18:51:25 +0000 (+0200)
Subject: Do not show "Script ended normally" upon forced rerun
X-Git-Tag: php-7.0.0beta2~6^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=699e641e93e2a697e8418b4f59d84227324631d2;p=php

Do not show "Script ended normally" upon forced rerun
---

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 3fa69cfe62..ffd0fa5bd1 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1814,8 +1814,10 @@ phpdbg_out:
 			php_request_shutdown(NULL);
 		} zend_end_try();
 
-		if ((PHPDBG_G(flags) & (PHPDBG_IS_QUITTING | PHPDBG_IS_RUNNING)) == PHPDBG_IS_RUNNING && !quit_immediately) {
-			phpdbg_notice("stop", "type=\"normal\"", "Script ended normally");
+		if ((PHPDBG_G(flags) & (PHPDBG_IS_QUITTING | PHPDBG_IS_RUNNING)) == PHPDBG_IS_RUNNING) {
+			if (!quit_immediately && !phpdbg_startup_run) {
+				phpdbg_notice("stop", "type=\"normal\"", "Script ended normally");
+			}
 			cleaning++;
 		}