arg, reverting the merge info

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

diff --git a/STATUS b/STATUS
index 6e6ab01d6b8d826c0018c7a6c2236474d07d83c0..c2cffba11336434ecab0ded6908969294d5ff4ec 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -297,24 +297,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         Trunk version of patch works
      +1: rpluem,
 
-  *) core/mod_ssl: add Protocols/ProtocolsHonorOrder directives and new 
-     protocols hooks to control Upgrade: and ALPN protocol switching.
-     HTTP_MISDIRECTED_REQUEST addition and handling in mod_ssl
-     trunk patch: http://svn.apache.org/r1697855
-                  http://svn.apache.org/r1697339
-                  http://svn.apache.org/r1696428
-                  http://svn.apache.org/r1696266
-                  http://svn.apache.org/r1696264
-                  http://svn.apache.org/r1695874
-                  http://svn.apache.org/r1695727
-                  http://svn.apache.org/r1692516
-                  http://svn.apache.org/r1692486
-                  http://svn.apache.org/r1610674 (partial)
-                  http://svn.apache.org/r1685069
-    2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-protocols.patch
-    +1: icing, 
-
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED