Merged x2.

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

diff --git a/STATUS b/STATUS
index 441e23d87de6bb9de836ff1c84627f50810c2c41..24facded5b4786c152fe75fa01aa342f1633ba27 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -152,13 +152,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) mod_http2 v2.0.26. fixes `Data:` in upgrade responses and a small memory
-      leak in h2 header buckets.
-      trunk patch: http://svn.apache.org/r1915281
-      2.4.x patch: svn merge -c 1915281 ^/httpd/httpd/trunk .
-      +1: icing, gbechis, jorton
-      rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise
-      +1 from me on the backport.
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -204,14 +197,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       +1: minfrin
       -1: jorton, appears to be a duplicate of the existing -B option
 
-   *) mod_xml2enc: fix XML media type matching to avoid corruption of
-      non-XML documents.
-      trunk patch: https://svn.apache.org/r1884505
-                   https://svn.apache.org/r1915625
-      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/410.patch
-      Github PR: https://github.com/apache/httpd/pull/410
-      +1: jorton, ylavic, gbechis
-
    *) mod_proxy: Don't reset the balancer when we create a new child
       and don't change shared memory mod_lbmethod_bytraffic is not using.
       trunk patch: https://svn.apache.org/r1916004