summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_prompt.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-09-23 18:30:13 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-09-23 18:30:13 +0200
commitbccac3774bade617d88da45e7f1781151bb16160 (patch)
treeefc2d722729e828ee824aee41b903b4d91222641 /sapi/phpdbg/phpdbg_prompt.c
parent4a174ca7e602fb20d12b8b665eaf3ce5d4d46bd3 (diff)
downloadphp-git-bccac3774bade617d88da45e7f1781151bb16160.tar.gz
Fixed bug #70531 (-rr should not fallback to interactive mode in phpdbg)
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
-rw-r--r--sapi/phpdbg/phpdbg_prompt.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 0314d39f24..f5341075d0 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -1476,6 +1476,11 @@ void phpdbg_execute_ex(zend_execute_data *execute_data) /* {{{ */
}
#endif
+ if (PHPDBG_G(flags) & PHPDBG_PREVENT_INTERACTIVE) {
+ phpdbg_print_opline_ex(execute_data, 0);
+ goto next;
+ }
+
/* check for uncaught exceptions */
if (exception && PHPDBG_G(handled_exception) != exception && !(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) {
zend_execute_data *prev_ex = execute_data;