]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update after backport
authorStefan Eissing <icing@apache.org>
Fri, 8 Feb 2019 09:02:13 +0000 (09:02 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 8 Feb 2019 09:02:13 +0000 (09:02 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1853198 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index ffcda3b41697d6e6364f61aec8b981771b5ea840..f99bbd855a790f4e6746b660c3cefa8e04fbc9d0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -141,14 +141,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
              change btw), while the warning addressed by r1850834 is annoying
              for 2.4.38.
 
-  *) 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, rpluem, icing
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]