Propose.

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

diff --git a/STATUS b/STATUS
index c4f193f8ae6b6764db343c90f4bead78eefe5ad0..bf38774dcec497ac4cd95ad372f158c3a389c074 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -209,6 +209,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1850745 ^/httpd/httpd/trunk .
      +1: jim
 
+  *) mod_ssl: Don't unset FIPS mode on restart unless it's forced by
+     configuration (SSLFIPS on) and not active by default in OpenSSL. PR 63136.
+     trunk patch: http://svn.apache.org/r1853133
+                  http://svn.apache.org/r1853166
+     2.4.x patch: svn merge -c 1853133,1853166 ^/httpd/httpd/trunk .
+                  (trunk works, modulo CHANGES)
+     +1: ylavic
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED