From: Rainer Jung <rjung@apache.org>
Date: Wed, 20 Apr 2022 21:16:29 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.54-rc1-candidate~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=422b433548b9d49b806a274e5e04f27700c78c7b;p=thirdparty%2Fapache%2Fhttpd.git

Propose.
[skip ci]


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

diff --git a/STATUS b/STATUS
index 7edb41ba5f5..9c86339ada9 100644
--- a/STATUS
+++ b/STATUS
@@ -190,9 +190,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      "10" for HeartbeatMaxServers instead of "0". With "0"
      no shared memory slotmem was initialized.
      trunk patches: https://svn.apache.org/r1899841
-     trunk patches: https://svn.apache.org/r1900026
+                    https://svn.apache.org/r1900026
      2.4.x patches: svn merge -c 1899841 ^/httpd/httpd/trunk .
-     2.4.x patches: svn merge -c 1900026 ^/httpd/httpd/trunk .
+                    svn merge -c 1900026 ^/httpd/httpd/trunk .
      +1: rjung, rpluem
 
   *) mod_proxy: Set a status code of 502 in case the backend just closed the
@@ -209,6 +209,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Can be applied via apply_backport_pr.sh 314
      +1: rpluem, ylavic,
 
+  *) mod_proxy: Add backend port to log messages to
+     ease identification of involved service.
+     trunk patches: https://svn.apache.org/r1900028
+     2.4.x patches: svn merge -c 1900028 ^/httpd/httpd/trunk .
+     +1: rjung, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]