From 45440955336699cf399583b937ffd6bb032c40a2 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 24 Sep 2013 15:57:07 +0000 Subject: [PATCH] Suppress formatting of startup messages written to the console when ErrorLogFormat is used. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525931 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/log.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f461135f248..9ffc8733319 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 b3157369f55..5f3b4ed9846 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); -- 2.47.3