]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
reverting current backport proposal for SSLPolicy
authorStefan Eissing <icing@apache.org>
Mon, 19 Feb 2018 09:23:40 +0000 (09:23 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 19 Feb 2018 09:23:40 +0000 (09:23 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824725 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 08e03bf58ec7d7e352c07698da6dc6f95eca9183..de2cfe3a51f48b8e6573a7023ff9b93bc387a123 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -168,18 +168,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    merge, YMMV :)
      +1: ylavic, minfrin (with mmn bump for CONN_STATE_NUM)
 
-  *) mod_ssl: Introduce SSLPolicy/SSLPolicyDefine directives.
-     trunk patch: http://svn.apache.org/r1805182
-                  http://svn.apache.org/r1805186
-                  http://svn.apache.org/r1808335
-                  http://svn.apache.org/r1811475
-                  http://svn.apache.org/r1817381
-                  http://svn.apache.org/r1817894
-     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod_ssl_policy.diff
-     +1: icing, minfrin
-     minfrin: 2.4.x patch not applying for me, trunk patches work
-     icing: fixed the patch to include complete new files instead of svn's internal optimizations
-
   *) mod_dav: Allow other modules to become providers and add ACLs
      to the DAV response.
      trunk patch: http://svn.apache.org/r1748322