From: Jim Jagielski <jim@apache.org>
Date: Tue, 19 Mar 2019 18:11:08 +0000 (+0000)
Subject: and promote backports with >= 3 votes
X-Git-Tag: 2.4.39~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=933dbe9ff8db9c783d6803bb89879c67d0676a86;p=thirdparty%2Fapache%2Fhttpd.git

and promote backports with >= 3 votes


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

diff --git a/STATUS b/STATUS
index 0f967729fbd..a830dff7451 100644
--- a/STATUS
+++ b/STATUS
@@ -126,6 +126,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy/ssl: Cleanup per-request SSL configuration anytime a backend
+     connection is recycled/reused to avoid a possible crash with some SSLProxy
+     configurations in <Location> or <Proxy> context. PR 63256.
+     trunk patch: http://svn.apache.org/r1855646
+                  http://svn.apache.org/r1855748
+     2.4.x patch svn merge -c 1855646,1855748 ^/httpd/httpd/trunk .
+     +1: ylavic, jorton, jim
+
+  *) mod_ssl: Fix restoring SSL state for TLSv1.3 PHA client cert verification.
+     trunk patch: http://svn.apache.org/1855849
+     2.4.x patch: svn merge -c 1855849 ^/httpd/httpd/trunk .
+     +1: jorton, covener, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -213,19 +227,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              possible. Changes from v3 to v4 (r1853953 mainly, r1853956 is only
              comment) are non functional (or at least intended as such).
 
-  *) mod_proxy/ssl: Cleanup per-request SSL configuration anytime a backend
-     connection is recycled/reused to avoid a possible crash with some SSLProxy
-     configurations in <Location> or <Proxy> context. PR 63256.
-     trunk patch: http://svn.apache.org/r1855646
-                  http://svn.apache.org/r1855748
-     2.4.x patch svn merge -c 1855646,1855748 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, jim
-
-  *) mod_ssl: Fix restoring SSL state for TLSv1.3 PHA client cert verification.
-     trunk patch: http://svn.apache.org/1855849
-     2.4.x patch: svn merge -c 1855849 ^/httpd/httpd/trunk .
-     +1: jorton, covener, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]