summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--server/log.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index f461135f24..9ffc873331 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) Suppress formatting of startup messages written to the console when
+ ErrorLogFormat is used. [Jeff Trawick]
+
*) mod_authnz_ldap: Change default value of AuthLDAPMaxSubGroupDepth to 0
to avoid performance problems when subgroups aren't in use. [Eric Covener]
diff --git a/server/log.c b/server/log.c
index b3157369f5..5f3b4ed984 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1150,7 +1150,7 @@ static void log_error_core(const char *file, int line, int module_index,
* prepare and log one line
*/
- if (log_format) {
+ if (log_format && !info.startup) {
len += do_errorlog_format(log_format, &info, errstr + len,
MAX_STRING_LEN - len,
&errstr_start, &errstr_end, fmt, args);