From: Joe Orton <jorton@apache.org>
Date: Wed, 20 Mar 2019 15:51:02 +0000 (+0000)
Subject: Merged x2.
X-Git-Tag: 2.4.39~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0681cbee9506afea28fdbe6c7ccd196c60074c2c;p=thirdparty%2Fapache%2Fhttpd.git

Merged x2.


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

diff --git a/STATUS b/STATUS
index a830dff7451..8b0fa691731 100644
--- a/STATUS
+++ b/STATUS
@@ -126,19 +126,6 @@ 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 ]