diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-09-23 18:30:13 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-09-23 18:30:13 +0200 |
| commit | bccac3774bade617d88da45e7f1781151bb16160 (patch) | |
| tree | efc2d722729e828ee824aee41b903b4d91222641 /sapi/phpdbg/phpdbg.c | |
| parent | 4a174ca7e602fb20d12b8b665eaf3ce5d4d46bd3 (diff) | |
| download | php-git-bccac3774bade617d88da45e7f1781151bb16160.tar.gz | |
Fixed bug #70531 (-rr should not fallback to interactive mode in phpdbg)
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index bf3a45184e..a66576c61e 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1835,6 +1835,11 @@ phpdbg_interact: if (phpdbg_startup_run) { quit_immediately = phpdbg_startup_run > 1; phpdbg_startup_run = 0; + if (quit_immediately) { + PHPDBG_G(flags) |= PHPDBG_IS_INTERACTIVE | PHPDBG_PREVENT_INTERACTIVE; + } else { + PHPDBG_G(flags) |= PHPDBG_IS_INTERACTIVE; + } PHPDBG_COMMAND_HANDLER(run)(NULL); if (quit_immediately) { /* if -r is on the command line more than once just quit */ |