From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 15 Mar 2023 11:10:56 +0000 (+0000)
Subject: Propose backport.
X-Git-Tag: 2.4.57-rc1-candidate~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9290bbbd588123d4aff7b5234096be0d701fdc8;p=thirdparty%2Fapache%2Fhttpd.git

Propose backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908409 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index b80fb39e481..c775d974474 100644
--- a/STATUS
+++ b/STATUS
@@ -196,6 +196,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1907565 ^/httpd/httpd/trunk .
      +1: rpluem,
 
+  *) core: Add formats %{z} and %{strftime-format} to ErrorLogFormat, and make
+     sure that if the format is configured early enough it applies to every log
+     line.  PR 62161.
+     trunk patch: https://svn.apache.org/r1908380
+                  https://svn.apache.org/r1908383
+                  https://svn.apache.org/r1908384
+                  https://svn.apache.org/r1908388
+                  https://svn.apache.org/r1908389
+                  https://svn.apache.org/r1908390
+                  https://svn.apache.org/r1908393
+                  https://svn.apache.org/r1908394
+                  https://svn.apache.org/r1908406
+                  https://svn.apache.org/r1908407
+     2.4.x patch: svn merge -c 1908380,1908383-1908384,1908388-1908390,1908393-1908394,1908406-1908407 ^/httpd/httpd/trunk .
+     +1: ylavic
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]