From: Jeff Trawick <trawick@apache.org>
Date: Fri, 3 Jun 2005 08:28:13 +0000 (+0000)
Subject: backport a couple more easy fixes pretty please
X-Git-Tag: 2.0.55~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46580d8248beef38cebf7cfeff15869a53cce759;p=thirdparty%2Fapache%2Fhttpd.git

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 f3c31e7123b..61993509205 100644
--- 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.