From: Joe Orton <jorton@apache.org>
Date: Fri, 9 Feb 2018 10:21:58 +0000 (+0000)
Subject: Merged x3.
X-Git-Tag: 2.4.30~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4899268ad1652619a8662f2ad683ab54d133b93;p=apache

Merged x3.

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

diff --git a/STATUS b/STATUS
index 063e0626a6..23a13c0c9d 100644
--- a/STATUS
+++ b/STATUS
@@ -119,22 +119,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_lua: Link against -lcrypt if present
-     trunk patch: http://svn.apache.org/r1822305
-     2.4.x patch: trunk works
-     +1: jorton, jim, ylavic
-
-  *) ab: Fix potential link issues with SSL libraries.
-     trunk patch: http://svn.apache.org/r1816534
-     2.4.x patch: trunk works
-     +1: jorton, jim, ylavic
-
-  *) mod_ssl: Fail if SSLCompression is used and OpenSSL is
-     built without compression methods.
-     trunk patch: http://svn.apache.org/r1556473
-     2.4.x patch: trunk works
-     +1: jorton, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]