From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 15 Apr 2022 12:06:18 +0000 (+0000)
Subject: * Vote
X-Git-Tag: 2.4.54-rc1-candidate~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3065ce2b54068a6a55e7b39bbbbf231fa9a39db7;p=thirdparty%2Fapache%2Fhttpd.git

* Vote

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

diff --git a/STATUS b/STATUS
index 1abd0e17976..f28d48389f9 100644
--- a/STATUS
+++ b/STATUS
@@ -189,7 +189,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      no shared memory slotmem was initialized.
      trunk patch: https://svn.apache.org/r1899809
      2.4.x patch: svn merge -c 1899809 ^/httpd/httpd/trunk .
-     +1: rjung
+     +1: rjung, rpluem
+     rpluem says: Has a conflict in CHANGES. Please put each change entry
+     in a separate file below changes-entries. See README.CHANGES.
 
   *) mod_proxy: Set a status code of 502 in case the backend just closed the
      connection in reply to our forwarded request.