diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 13:55:14 +0100 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 17:25:46 +0100 |
commit | c895fbea22cb0d7bedfa9e3429a073c8eefca84a (patch) | |
tree | 5437b4648d6ac13b480e58a4ad65b8e95294fa6e | |
parent | b7d83ff8a69f60820ac45ffc02d903482c40399f (diff) | |
download | php-git-c895fbea22cb0d7bedfa9e3429a073c8eefca84a.tar.gz |
Fix quitting on a second run
-rw-r--r-- | phpdbg.c | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -1527,21 +1527,20 @@ phpdbg_main: PHPDBG_G(flags) |= PHPDBG_IS_STEPPING; } - if (phpdbg_startup_run) { - zend_try { - PHPDBG_COMMAND_HANDLER(run)(NULL TSRMLS_CC); - } zend_end_try(); - if (phpdbg_startup_run > 1) { - /* if -r is on the command line more than once just quit */ - goto phpdbg_out; - } - phpdbg_startup_run = 0; - } - phpdbg_interact: /* phpdbg main() */ do { zend_try { + if (phpdbg_startup_run) { + PHPDBG_COMMAND_HANDLER(run)(NULL TSRMLS_CC); + if (phpdbg_startup_run > 1) { + /* if -r is on the command line more than once just quit */ + EG(bailout) = __orig_bailout; /* reset zend_try */ + break; + } + phpdbg_startup_run = 0; + } + phpdbg_interactive(1 TSRMLS_CC); } zend_catch { if ((PHPDBG_G(flags) & PHPDBG_IS_CLEANING)) { |