From: Jim Jagielski <jim@apache.org>
Date: Wed, 2 Jan 2008 19:19:04 +0000 (+0000)
Subject: Promote patch
X-Git-Tag: 2.2.7~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4c3452e20bb8bc0e8b75fc75dacf9463cc348ed;p=thirdparty%2Fapache%2Fhttpd.git

Promote patch


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

diff --git a/STATUS b/STATUS
index 2c8851b7f41..f0ff4647d5d 100644
--- a/STATUS
+++ b/STATUS
@@ -107,6 +107,18 @@ 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/~wrowe/mod_proxy_ftp_dir_listing-2.2.diff
+      +1: wrowe, rpluem, jim
+      -0: niq: I dislike this patch for reasons stated on-list, but it
+               delivers the functionality needed for the charset "showstopper".
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -164,17 +176,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rpluem: I am +1 once we have a confirmation from Werner that this patch fixes
      his problem as this patch has some differences to his original patch.
 
-  * 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/~wrowe/mod_proxy_ftp_dir_listing-2.2.diff
-      +1: wrowe, rpluem, jim
-      -0: niq: I dislike this patch for reasons stated on-list, but it
-               delivers the functionality needed for the charset "showstopper".
-
   * mod_ssl: Fix handling of buffered request body for per-location SSL
     renegotiation when an internal redirect occurs. PR 43738. [Joe Orton]
       Trunk version of patch: