]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Propose [skip ci]
authorRuediger Pluem <rpluem@apache.org>
Mon, 23 May 2022 07:16:01 +0000 (07:16 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 23 May 2022 07:16:01 +0000 (07:16 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901147 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 026bf94312c42422c70be0ee8ac0d41f8df53a1b..9b2fc47f0cae3c4f7ce2b617912ab466e602ec31 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -214,6 +214,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patches: svn merge -c 1900157 ^/httpd/httpd/trunk .
      +1: ylavic,
 
+  *) mod_proxy_connect: Ensure that the configured timeout is set on the
+     backend socket.
+     Trunk version of patch:
+        https://svn.apache.org/r1901088
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1901088 ^/httpd/httpd/trunk .
+     +1: rpluem,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]