From: Graham Leggett <minfrin@apache.org>
Date: Mon, 17 Jul 2023 21:14:57 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.58-rc1-candidate~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0a1f2e763266ea950d0778949c6992e51babe0;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 5dadfef7da7..fbd809b0f92 100644
--- a/STATUS
+++ b/STATUS
@@ -152,6 +152,27 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) 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
+                  https://svn.apache.org/r1908556
+                  https://svn.apache.org/r1908557
+     2.4.x patch: svn merge -c 1908380,1908383-1908384,1908388-1908390,1908393-1908394,1908406-1908407,1908556-1908557 ^/httpd/httpd/trunk .
+                  (merge works modulo MMN, or patch/PR below)
+                  https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/350.diff
+                  https://github.com/apache/httpd/pull/350
+     +1: ylavic, rpluem, minfrin
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -173,27 +194,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: r1745033 seems related and should in included
      minfrin: r1745033 is now included
 
-  *) core: Add formats %{z} and %{strftime-format} to ErrorLogFormat, and make
-     sure that if the forat 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
-                  https://svn.apache.org/r1908556
-                  https://svn.apache.org/r1908557
-     2.4.x patch: svn merge -c 1908380,1908383-1908384,1908388-1908390,1908393-1908394,1908406-1908407,1908556-1908557 ^/httpd/httpd/trunk .
-                  (merge works modulo MMN, or patch/PR below)
-                  https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/350.diff
-                  https://github.com/apache/httpd/pull/350
-     +1: ylavic, rpluem,
-
   *) mod_proxy: If we fail to connect to all looked up IP's from the worker
      lookup cache it might be caused by a change on DNS side. Try another
      DNS lookup in this case and in case this causes a successful connection