add/reset

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

diff --git a/STATUS b/STATUS
index 6225d32d5026095f6f455873e1c83582784d3e51..94671fb2c39e1be3e82caf16cf6935daef6b2156 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -153,8 +153,11 @@ RELEASE SHOWSTOPPERS:
 
   *) maintain ct trusted flag across ap_internal_fast_redirect
      Trunk version of patch: https://svn.apache.org/r1918795.
-     2.4.x patch:  svn merge -c 1918795 ^/httpd/httpd/trunk .
-     +1 covener, ylavic
+        https://svn.apache.org/r1918814
+        https://svn.apache.org/r1918815
+        https://svn.apache.org/r1918823
+     2.4.x patch:  https://github.com/apache/httpd/pull/459
+     +1 covener
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]