From 384bb7ddd9c76e66734ec7bb6aa9e13f7a313762 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 26 Sep 2013 11:12:51 +0000 Subject: [PATCH] Merge r1525931 from trunk: APLOG_STARTUP messages shouldn't have custom ErrorLogFormat applied. Reviewed by: jim, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1526442 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 5 ----- server/log.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 2f600505b9..408de47955 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.7 + *) Suppress formatting of startup messages written to the console when + ErrorLogFormat is used. [Jeff Trawick] + *) mod_auth_digest: Be more specific when the realm mismatches because the realm has not been specified. [Graham Leggett] diff --git a/STATUS b/STATUS index 2516790d09..615a401397 100644 --- a/STATUS +++ b/STATUS @@ -97,11 +97,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * APLOG_STARTUP messages shouldn't have custom ErrorLogFormat applied. - trunk: http://svn.apache.org/r1525931 - 2.4.x: trunk patch works - +1: trawick, jim, covener - * mod_proxy: Add a note in the balancer manager whether inherits will/will not be done. trunk patch: http://svn.apache.org/r1524158 diff --git a/server/log.c b/server/log.c index f9680a8be1..7bbd708b61 100644 --- a/server/log.c +++ b/server/log.c @@ -1255,7 +1255,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.50.1