| Index: trunk/php/wmerrors/wmerrors.c |
| — | — | @@ -55,6 +55,7 @@ |
| 56 | 56 | STD_PHP_INI_ENTRY("wmerrors.logging_file", "", PHP_INI_ALL, OnUpdateString, logging_file, zend_wmerrors_globals, wmerrors_globals) |
| 57 | 57 | STD_PHP_INI_ENTRY("wmerrors.log_level", "0", PHP_INI_ALL, OnUpdateLong, log_level, zend_wmerrors_globals, wmerrors_globals) |
| 58 | 58 | STD_PHP_INI_BOOLEAN("wmerrors.ignore_logging_errors", "0", PHP_INI_ALL, OnUpdateBool, ignore_logging_errors, zend_wmerrors_globals, wmerrors_globals) |
| | 59 | + STD_PHP_INI_BOOLEAN("wmerrors.concise_backtrace_in_error_log", "0", PHP_INI_ALL, OnUpdateBool, concise_backtrace_in_error_log, zend_wmerrors_globals, wmerrors_globals) |
| 59 | 60 | PHP_INI_END() |
| 60 | 61 | |
| 61 | 62 | void (*old_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args); |
| — | — | @@ -157,8 +158,8 @@ |
| 158 | 159 | } |
| 159 | 160 | |
| 160 | 161 | /* Put a concise backtrace in the normal output */ |
| 161 | | - /* TODO: Make configurable */ |
| 162 | | - wmerrors_get_backtrace(&new_filename); |
| | 162 | + if (WMERRORS_G(concise_backtrace_in_error_log)) |
| | 163 | + wmerrors_get_backtrace(&new_filename); |
| 163 | 164 | smart_str_appendl(&new_filename, error_filename, strlen(error_filename)); |
| 164 | 165 | smart_str_0(&new_filename); |
| 165 | 166 | |
| Index: trunk/php/wmerrors/php_wmerrors.h |
| — | — | @@ -30,6 +30,7 @@ |
| 31 | 31 | int enabled; |
| 32 | 32 | long int log_level; |
| 33 | 33 | int ignore_logging_errors; |
| | 34 | + int concise_backtrace_in_error_log; |
| 34 | 35 | smart_str log_buffer; |
| 35 | 36 | ZEND_END_MODULE_GLOBALS(wmerrors) |
| 36 | 37 | |