summaryrefslogtreecommitdiff
path: root/phpdbg.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-10-25 18:48:43 +0200
committerBob Weinand <bobwei9@hotmail.com>2014-10-25 18:48:43 +0200
commitbbcee18b4b6d9220d4fdcb0d69a33979a5fa84a4 (patch)
treed743c196358ecc82b8b29559d58c534cce506adb /phpdbg.c
parentbe5242e0fedcf23bdf56a4b1a73f8a84c5b216ce (diff)
downloadphp-git-bbcee18b4b6d9220d4fdcb0d69a33979a5fa84a4.tar.gz
Fix phpdbg output when outputting via php with active output handlers
Diffstat (limited to 'phpdbg.c')
-rw-r--r--phpdbg.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/phpdbg.c b/phpdbg.c
index 91133b3efb..aaf1e5f406 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -477,15 +477,7 @@ static void php_sapi_phpdbg_log_message(char *message TSRMLS_DC) /* {{{ */
case E_USER_ERROR:
case E_PARSE:
case E_RECOVERABLE_ERROR:
- if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) {
- phpdbg_list_file(
- zend_get_executed_filename(TSRMLS_C),
- 3,
- zend_get_executed_lineno(TSRMLS_C)-1,
- zend_get_executed_lineno(TSRMLS_C)
- TSRMLS_CC
- );
- }
+ phpdbg_list_file(zend_get_executed_filename(TSRMLS_C), 3, zend_get_executed_lineno(TSRMLS_C)-1, zend_get_executed_lineno(TSRMLS_C) TSRMLS_CC);
do {
switch (phpdbg_interactive(1 TSRMLS_CC)) {