vote and promote

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

diff --git a/STATUS b/STATUS
index 1f2d0da30a426c7184f7c83bec2ba87f967d0d90..d8a3fdb868e6c01d8f10a4af826a1e015ffd1afb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_proxy_ftp: Introduce the ProxyFtpDirCharset directive, allowing
+    the administrator to identify a default, or specific servers or paths
+    which list their contents in other-than ISO-8859-1 charset (e.g. utf-8).
+    [Ruediger Pluem]
+      trunk version; http://svn.apache.org/viewvc?view=rev&revision=607638
+      backport;
+        http://people.apache.org/~rpluem/patches/mod_proxy_ftp_dir_listing-2.0.diff
+      +1: wrowe, rpluem, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
@@ -130,15 +139,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           do we need to make people opt-in for this behavior to 
           backport it to 2.0.x? What mechanism?
 
-  * mod_proxy_ftp: Introduce the ProxyFtpDirCharset directive, allowing
-    the administrator to identify a default, or specific servers or paths
-    which list their contents in other-than ISO-8859-1 charset (e.g. utf-8).
-    [Ruediger Pluem]
-      trunk version; http://svn.apache.org/viewvc?view=rev&revision=607638
-      backport;
-        http://people.apache.org/~rpluem/patches/mod_proxy_ftp_dir_listing-2.0.diff
-      +1: wrowe, rpluem
-
   * Backport 164538: add ap_vhost_iterate_given_conn().
     Trunk version of patch:
        http://svn.apache.org/viewvc?view=rev&revision=164538