Merged x2.

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

diff --git a/STATUS b/STATUS
index 6612293c9e0701a1f1083c24604c5c0ec5857f8e..1bf80b0bbb8919205e3db0aef80f05ff9dc0946c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -126,28 +126,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_auth_digest: Fix a race condition. Authentication with valid credentials could be
-     refused in case of concurrent accesses from different users.  PR 63124
-     trunk patch: https://svn.apache.org/r1853190
-     2.4.x patch: svn merge -c 1853190 ^/httpd/httpd/trunk .
-     +1: jailletc36, icing, jorton
-
-  *) Easy proposals:
-        - mod_dav: Add a comment
-        - mod_info: Constify fixed tables and mark module-private global variables static
-        - mod_heartmonitor: Axe an apparently out of date comment
-        - mod_deflate: Fix clang and Coverity warnings
-        - md_acme_authz: fix typo
-        - mod_dav: tag a pool 
-     trunk patch:
-        - https://svn.apache.org/r1486027
-        - https://svn.apache.org/r1828909
-        - https://svn.apache.org/r1839249
-        - https://svn.apache.org/r1842888
-        - https://svn.apache.org/r1844343
-        - https://svn.apache.org/r1846651
-     2.4.x patch: svn merge -c 1486027,1828909,1839249,1842888,1844343,1846651 ^/httpd/httpd/trunk .
-     +1: jailletc36, icing, jorton
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]