diff options
Diffstat (limited to 'server/log.c')
| -rw-r--r-- | server/log.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/server/log.c b/server/log.c index f3347d9834..6beb03a701 100644 --- a/server/log.c +++ b/server/log.c @@ -1098,6 +1098,9 @@ static void log_error_core(const char *file, int line, int module_index, errorlog_provider = ap_server_conf->errorlog_provider; errorlog_provider_handle = ap_server_conf->errorlog_provider_handle; } + + /* Use the main ErrorLogFormat if any */ + sconf = ap_get_core_module_config(ap_server_conf->module_config); } else { int configured_level = r ? ap_get_request_module_loglevel(r, module_index) : @@ -1145,6 +1148,10 @@ static void log_error_core(const char *file, int line, int module_index, } } } + else { + /* Use the main ErrorLogFormat if any */ + sconf = ap_get_core_module_config(ap_server_conf->module_config); + } } if (!logf && !(errorlog_provider && errorlog_provider_handle)) { @@ -1215,7 +1222,7 @@ static void log_error_core(const char *file, int line, int module_index, info.file = file; info.line = line; info.status = status; - log_format = sconf ? sconf->error_log_format : NULL; + log_format = sconf->error_log_format; done = 1; } |