From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 14 Sep 2002 20:36:30 +0000 (+0000)
Subject:   At least follow the proper failure path for failure to open the log file
X-Git-Tag: 2.0.42~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2a40c0ccf8121cb32ce0b685b2e6855f0fe47f;p=thirdparty%2Fapache%2Fhttpd.git

  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
---

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index e6b0efbcd4c..455e149b647 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));
         }
     }