From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 27 Feb 2020 11:09:02 +0000 (+0000)
Subject: Backported.
X-Git-Tag: 2.4.42~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7d52d3068942fec08a3ec4753c2d8fc92564a2e;p=thirdparty%2Fapache%2Fhttpd.git

Backported.

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

diff --git a/STATUS b/STATUS
index 3385baa4bb1..21933a59d78 100644
--- a/STATUS
+++ b/STATUS
@@ -132,13 +132,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_ajp: Allow secret= parameter for AJP which is now 
-     suggested/required by tomcat
-     trunk patch: http://svn.apache.org/r1738878  
-     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-ajpsecret.diff
-                  (trivial conflict in mod_proxy.c)
-     +1: covener, jorton, rjung
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]