Sync proposed patch and trunk/

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

diff --git a/STATUS b/STATUS
index 25fd7f48771aa6cfa6ec0598b8900f37d6669185..2ad4a9b2b424171888ddec1bdb013fb729ecc876 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -215,6 +215,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1524192
                  https://svn.apache.org/viewvc?view=revision&revision=1524770
                  https://svn.apache.org/viewvc?view=revision&revision=1527925
+                 https://svn.apache.org/viewvc?view=revision&revision=1541270
+                 https://svn.apache.org/viewvc?view=revision&revision=1541368
     2.4.x patch (plus CHANGES entry above):
         http://people.apache.org/~wrowe/httpd-2.4-r1524192-r1524770-TE-CL.patch
     +1: