From 40f5690256f4c89317b1d3a9e94801a6cf58a352 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Tue, 18 Jan 2011 09:01:19 +0000 Subject: [PATCH] Check for s->module_config before using it, as the faked server_rec from mod_cgid does not have it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060245 13f79535-47bb-0310-9956-ffa450edef68 --- server/log.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/server/log.c b/server/log.c index 5e618b27b7..4f7bf081b6 100644 --- a/server/log.c +++ b/server/log.c @@ -1131,27 +1131,30 @@ static void log_error_core(const char *file, int line, int module_index, } } - sconf = ap_get_module_config(s->module_config, &core_module); - if (c && !c->log_id) { - add_log_id(c, NULL); - if (sconf->error_log_conn && sconf->error_log_conn->nelts > 0) - log_conn_info = 1; - } - if (r) { - if (r->main) - rmain = r->main; - else - rmain = r; - - if (!rmain->log_id) { - /* XXX: do we need separate log ids for subrequests? */ - if (sconf->error_log_req && sconf->error_log_req->nelts > 0) - log_req_info = 1; - /* - * XXX: potential optimization: only create log id if %L is - * XXX: actually used - */ - add_log_id(c, rmain); + /* the faked server_rec from mod_cgid does not have s->module_config */ + if (s->module_config) { + sconf = ap_get_module_config(s->module_config, &core_module); + if (c && !c->log_id) { + add_log_id(c, NULL); + if (sconf->error_log_conn && sconf->error_log_conn->nelts > 0) + log_conn_info = 1; + } + if (r) { + if (r->main) + rmain = r->main; + else + rmain = r; + + if (!rmain->log_id) { + /* XXX: do we need separate log ids for subrequests? */ + if (sconf->error_log_req && sconf->error_log_req->nelts > 0) + log_req_info = 1; + /* + * XXX: potential optimization: only create log id if %L is + * XXX: actually used + */ + add_log_id(c, rmain); + } } } } -- 2.40.0