From: Jim Jagielski <jim@apache.org>
Date: Thu, 17 Apr 2008 14:01:10 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.2.9~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe900b343ba4929f7aef4d145caeaadd3f9b7e8;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 671e7b5155a..9f5811f2764 100644
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
    +1: jim, rpluem, covener
 
+ * mod_substitute: Make default behavior flattening of buckets. Allow
+   for people to specifically set "quick" mode.
+      Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=627764
+         http://svn.apache.org/viewvc?view=rev&revision=628864
+      Backport version for 2.2.x of patch:
+         Trunk version works (minus CHANGES conflict)
+    +1: jim, covener, wrowe
+
+  * mod_speling: remove regression from 1.3/2.0 behavior and
+    drop dependency between mod_speling and AcceptPathInfo.
+    PR: 43562
+   Trunk version of patch: 
+       http://svn.apache.org/viewvc?view=rev&revision=635953
+   Backport version for 2.2.x of patch:
+       Trunk version of patch works
+   +1: jim, niq, wrowe
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -179,15 +197,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  well bypass <Location> checks on these, and also handle
                  any external modules that might try passing r->uri as NULL.
 
- * mod_substitute: Make default behavior flattening of buckets. Allow
-   for people to specifically set "quick" mode.
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=627764
-         http://svn.apache.org/viewvc?view=rev&revision=628864
-      Backport version for 2.2.x of patch:
-         Trunk version works (minus CHANGES conflict)
-    +1: jim, covener, wrowe
-
  * Support chroot on unix-family platforms
    PR 43596
    http://svn.apache.org/viewvc?rev=611483&view=rev (source)
@@ -249,15 +258,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~chrisd/patches/mod_headers_merge/mod_headers-merge-2.2.x.patch
    +1: chrisd, niq
 
-  * mod_speling: remove regression from 1.3/2.0 behavior and
-    drop dependency between mod_speling and AcceptPathInfo.
-    PR: 43562
-   Trunk version of patch: 
-       http://svn.apache.org/viewvc?view=rev&revision=635953
-   Backport version for 2.2.x of patch:
-       Trunk version of patch works
-   +1: jim, niq, wrowe
-
  * mod_authn_dbd: Disambiguate and tidy database authentication
    error messages.  Also move assignment statements after #if blocks
    to avoid having them treated as variable declarations.