From cec9e8735fce500f1cc2231565a553a8a24b821a Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 14 Sep 2002 20:36:30 +0000 Subject: [PATCH] At least follow the proper failure path for failure to open the log file or logging process. Doesn't fix the lack of preflight testing. Reviewed by: Ian Holsman git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96814 13f79535-47bb-0310-9956-ffa450edef68 --- modules/loggers/mod_log_config.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index e6b0efbcd4..455e149b64 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -1098,7 +1098,7 @@ static config_log_state *open_config_log(server_rec *s, apr_pool_t *p, cls->log_writer = log_writer_init(p, s, cls->fname); if (cls->log_writer == NULL) - exit(1); + return NULL; return cls; } @@ -1135,7 +1135,9 @@ static config_log_state *open_multi_logs(server_rec *s, apr_pool_t *p) } } - cls = open_config_log(s, p, cls, mls->default_format); + if (open_config_log(s, p, cls, mls->default_format)) + return (apr_pstrcat(p, "Failed to initialize custom log to ", + cls->fname)); } } else if (mls->server_config_logs) { @@ -1150,7 +1152,9 @@ static config_log_state *open_multi_logs(server_rec *s, apr_pool_t *p) } } - cls = open_config_log(s, p, cls, mls->default_format); + if (open_config_log(s, p, cls, mls->default_format)) + return (apr_pstrcat(p, "Failed to initialize custom log to ", + cls->fname)); } } -- 2.40.0