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

diff --git a/CHANGES b/CHANGES
index f461135f248f00aaeb3b4ed95e8b89b368abf0b6..9ffc8733319a48fd05be29977fe8c915ae227fe6 100644 (file)
--- 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 b3157369f55fae65c874544c60d9252b3187df86..5f3b4ed98463f0ddd56f12c9688aa145ee702f38 100644 (file)
--- 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);