From: Jim Jagielski <jim@apache.org>
Date: Wed, 29 Aug 2007 22:34:53 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.0.61~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce6e6985777f17d0e3402c49304d1d2deb9cb98e;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 12313e97138..019ac7afb68 100644
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    *) mod_autoindex: Add in Type and Charset options to IndexOptions
+       to allow admin to set content-type and charset of generated
+       page.
+       Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=570532
+         http://svn.apache.org/viewvc?view=rev&revision=570535
+         http://svn.apache.org/viewvc?view=rev&revision=570558
+       2.0.x version of patch:
+         Trunk version works with fuzz (minus CHANGES conflicts)
+       +1: jim, wrowe, rpluem
+
 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
@@ -152,17 +163,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~wrowe/r520701-backport-2.2.patch
       +1: wrowe, rpluem
 
-    *) mod_autoindex: Add in Type and Charset options to IndexOptions
-       to allow admin to set content-type and charset of generated
-       page.
-       Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=570532
-         http://svn.apache.org/viewvc?view=rev&revision=570535
-         http://svn.apache.org/viewvc?view=rev&revision=570558
-       2.0.x version of patch:
-         Trunk version works with fuzz (minus CHANGES conflicts)
-       +1: jim, wrowe, rpluem
-
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.