backport a couple more easy fixes pretty please

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

diff --git a/STATUS b/STATUS
index f3c31e7123b09881368a4ea689fa6f9d003c5708..61993509205b1de1334380dee08bbde988e173dc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -263,6 +263,16 @@ PATCHES TO BACKPORT FROM TRUNK:
         http://svn.apache.org/viewcvs?rev=179317&view=rev
         +1: trawick
 
+     *) proxy FTP: Fix confusion about globbing characters which could lead
+        to getting a directory listing when a file was requested.  PR 34512.
+        http://svn.apache.org/viewcvs?rev=179704&view=rev
+        +1: trawick
+
+     *) mod_mime_magic: Handle CRLF-format magic files so that it works with
+        the default installation on Windows. 
+        http://svn.apache.org/viewcvs?rev=179622&view=rev
+        +1: trawick
+
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) Remove LDAP toolkit specific code from util_ldap and mod_auth_ldap.