diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-18 20:51:25 +0200 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-20 18:00:42 +0200 |
commit | 699e641e93e2a697e8418b4f59d84227324631d2 (patch) | |
tree | af00c9a68611fe63ee3dc1755bf6e94f0504a63d /sapi/phpdbg/phpdbg.c | |
parent | 6435eb80190ebfee00b8731ae369dba6d14a15f2 (diff) | |
download | php-git-699e641e93e2a697e8418b4f59d84227324631d2.tar.gz |
Do not show "Script ended normally" upon forced rerun
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
-rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
1 files changed, 4 insertions, 2 deletions
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++; } |