com php-src: Added breaking upon fatal-ish error: sapi/phpdbg/phpdbg.c

Commit: 62f0ffb34e89d3e1a6b3b3e6af73ef66eade67e8 Author: Bob Weinand <bobwei9@hotmail.com> Sat, 21 Dec 2013 22:42:11 +0100 Committer: Anatol Belski <ab@php.net> Tue, 24 Dec 2013 02:44:53 -0800 Parents: 4363b3865793b710c952358f6496f173f6e780bc Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=62f0ffb34e89d3e1a6b3b3e6af73ef66eade67e8 Log: Added breaking upon fatal-ish error Changed paths: M sapi/phpdbg/phpdbg.c Diff: diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 71208d2...a0665a7 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -439,6 +439,35 @@ static void php_sapi_phpdbg_log_message(char *message TSRMLS_DC) /* {{{ */ */ if (phpdbg_booted) { phpdbg_error("%s", message); + + switch (PG(last_error_type)) { + case E_ERROR: + case E_CORE_ERROR: + case E_COMPILE_ERROR: + 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 + ); + } + + do { + switch (phpdbg_interactive(TSRMLS_C)) { + case PHPDBG_LEAVE: + case PHPDBG_FINISH: + case PHPDBG_UNTIL: + case PHPDBG_NEXT: + return; + } + } while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)); + + } } else fprintf(stdout, "%s\n", message); } /* }}} */