Backported in 1935938

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

diff --git a/STATUS b/STATUS
index 4cb537146a8ecbc9b7886cce4a84ebcae96edf1e..dcf8ab02ebee5bce52e2dd3d437615a074e5cdcd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -163,14 +163,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Use HTTP_* and ap_is_*() macros instead of literal;
-     Use ap_strstr_c() instead of strstr() in mod_md.
-     trunk patch: https://svn.apache.org/r1934913
-     2.4.x patch: svn merge -c 1934913 ^/httpd/httpd/trunk .
-     Merging is clean when ignoring include/httpd.h,
-     modules/http/http_filters.c and modules/test/mod_policy.c.
-     +1: rjung, jim, jorton
-
   *) modules/md/mod_md_config.c: Flip MDServerStatus to
      disabled by default. mod_md is CTR, but probably not
      the change in default behavior. Needs an explicit
@@ -211,17 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://gist.github.com/jimjag/fc124b8938cbe9321e7f8d2ad943241d
      +1: jim, 
 
-  *) mod_proxy_html: Fix comment handling
-     trunk patch: https://svn.apache.org/r1935931
-     2.4.x patch: svn merge -c 1935931 ^/httpd/httpd/trunk
-     +1: jorton,
-
-  *) mod_autoindex: Various minor fixes
-     trunk patch: https://svn.apache.org/r1935931
-     2.4.x patch: svn merge -c 1922994,1931451,1935002 ^/httpd/httpd/trunk
-     2.4.x PR: https://github.com/apache/httpd/pull/682
-     +1: jorton,
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]