From: Jim Jagielski <jim@apache.org>
Date: Tue, 4 Sep 2007 11:31:37 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.2.6~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3226c9a2e8187d099ccb9a4b59853fef3c41367a;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 6e2352cd1a4..2a0d71851cd 100644
--- a/STATUS
+++ b/STATUS
@@ -80,38 +80,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-
-   * mod_authn_dbd: Export any additional columns queried in the SQL select
-     into the environment with the name AUTHENTICATE_<COLUMN>. This brings
-     mod_authn_dbd behaviour in line with mod_authnz_ldap.
-     Trunk: http://svn.apache.org/viewvc?view=rev&revision=466865
-            http://svn.apache.org/viewvc?view=rev&revision=571798
-            http://svn.apache.org/viewvc?view=rev&revision=571804
-     +1: minfrin
-     rpluem says: r466865 has a conflict in modules/aaa/mod_auth.h
-                  r571804 has a conflict in docs/manual/mod/mod_authnz_ldap.xml
-                  Without r571838 the documentation for mod_authn_dbd fails
-                  to build.
-
-    * multiple files,	Trivial cleanups
-      PR: 39518 - Christophe JAILLET
-      http://svn.apache.org/viewvc?view=rev&revision=557837
-      http://svn.apache.org/viewvc?view=rev&revision=557972
-      +1: rpluem
-      niq: this isn't a straight backport (which is why I dropped it).
-      +1 for core, modules/dav, modules/filters, and modules/ssl
-      Not Applicable to modules/aaa
-
-   * mod_include: Add an "if" directive syntax to test whether an URL
-     is accessible, and if so, conditionally display content. This
-     allows a webmaster to hide a link to a private page when the user
-     has no access to that page.
-     http://svn.apache.org/viewvc?view=rev&revision=571872
-     http://svn.apache.org/viewvc?view=rev&revision=571927
-     http://svn.apache.org/viewvc?view=rev&revision=572136
-     +1: minfrin
-
     * mod_cache: Remove expired content from cache that cannot be revalidated.
       PR 30370.
       Trunk version of patch:
@@ -146,6 +114,39 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: rpluem, fielding, jim
 
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+
+   * mod_authn_dbd: Export any additional columns queried in the SQL select
+     into the environment with the name AUTHENTICATE_<COLUMN>. This brings
+     mod_authn_dbd behaviour in line with mod_authnz_ldap.
+     Trunk: http://svn.apache.org/viewvc?view=rev&revision=466865
+            http://svn.apache.org/viewvc?view=rev&revision=571798
+            http://svn.apache.org/viewvc?view=rev&revision=571804
+     +1: minfrin
+     rpluem says: r466865 has a conflict in modules/aaa/mod_auth.h
+                  r571804 has a conflict in docs/manual/mod/mod_authnz_ldap.xml
+                  Without r571838 the documentation for mod_authn_dbd fails
+                  to build.
+
+    * multiple files,	Trivial cleanups
+      PR: 39518 - Christophe JAILLET
+      http://svn.apache.org/viewvc?view=rev&revision=557837
+      http://svn.apache.org/viewvc?view=rev&revision=557972
+      +1: rpluem
+      niq: this isn't a straight backport (which is why I dropped it).
+      +1 for core, modules/dav, modules/filters, and modules/ssl
+      Not Applicable to modules/aaa
+
+   * mod_include: Add an "if" directive syntax to test whether an URL
+     is accessible, and if so, conditionally display content. This
+     allows a webmaster to hide a link to a private page when the user
+     has no access to that page.
+     http://svn.apache.org/viewvc?view=rev&revision=571872
+     http://svn.apache.org/viewvc?view=rev&revision=571927
+     http://svn.apache.org/viewvc?view=rev&revision=572136
+     +1: minfrin
+
 PATCHES/ISSUES THAT ARE STALLED
 
     * mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability