com php-src: Fix quitting on a second run: sapi/phpdbg/phpdbg.c

Commit: 76bd799eb791e29e590ba4d89071ddd9374daefd Author: Bob Weinand <bobwei9@hotmail.com> Tue, 28 Oct 2014 13:55:14 +0100 Parents: c34fd924660a0c2f3b2ef6ce30d95b541b76ef61 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=76bd799eb791e29e590ba4d89071ddd9374daefd Log: Fix quitting on a second run Changed paths: M sapi/phpdbg/phpdbg.c Diff: diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 4bfbf4c..87bfb85 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -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)) {