From: Graham Leggett <minfrin@apache.org>
Date: Mon, 17 Jul 2023 21:03:37 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.4.58-rc1-candidate~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9984036296dbe0ec7e7327534923eaf6c7625c9d;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.


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

diff --git a/STATUS b/STATUS
index e2cefa33811..5dadfef7da7 100644
--- a/STATUS
+++ b/STATUS
@@ -165,10 +165,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/r1589993
         https://svn.apache.org/r1591012
         https://svn.apache.org/r1596108
+        https://svn.apache.org/r1745033
      Backport version for 2.4.x of patch:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-search.patch
+        svn merge -c r1745033 ^/httpd/httpd/trunk .
      +1: minfrin, jim,
      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