From: Jeff Trawick <trawick@apache.org>
Date: Sat, 10 Jul 2010 22:29:16 +0000 (+0000)
Subject: vote, promote
X-Git-Tag: 2.2.16~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48d3d1c0afe231fce0d3d3f809eeb7c812d2395f;p=thirdparty%2Fapache%2Fhttpd.git

vote, promote


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

diff --git a/STATUS b/STATUS
index dc916e31aca..d43506022ff 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,20 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    +1: niq, pgollucci
    +1: rbowen - After much debate on IRC, we've agreed on FallbackResource as being the right name for this.
 
+  *) core authnz: improve misleading error message.  PR 38322.
+     Trunk: N/A
+     2.2.x: https://issues.apache.org/bugzilla/attachment.cgi?id=25698
+     +1: niq, pgollucci, trawick
+
+  *) mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
+     title page only) when any mod_ldap directives were used in VirtualHost
+     context.
+     Trunk Patch: http://svn.apache.org/viewvc?rev=951235&view=rev (actual fix)
+                  http://svn.apache.org/viewvc?rev=951237&view=rev (error msg not displayed)
+     2.2.x patch: http://people.apache.org/~covener/2.2.x-ldap_serverconfig.diff
+         note: No actual per-server directives in 2.2.x mod_ldap, but per-directory 
+         mod_ldap directives under a virtualhost are sufficient to trigger this merge issue)
+     +1: covener, wrowe, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -201,16 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~minfrin/httpd-cache-partial-2.2.patch
     +1: minfrin
 
-  *) mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
-     title page only) when any mod_ldap directives were used in VirtualHost
-     context.
-     Trunk Patch: http://svn.apache.org/viewvc?rev=951235&view=rev (actual fix)
-                  http://svn.apache.org/viewvc?rev=951237&view=rev (error msg not displayed)
-     2.2.x patch: http://people.apache.org/~covener/2.2.x-ldap_serverconfig.diff
-         note: No actual per-server directives in 2.2.x mod_ldap, but per-directory 
-         mod_ldap directives under a virtualhost are sufficient to trigger this merge issue)
-     +1: covener, wrowe
-
   *) mod_cache: Explicitly allow cache implementations to cache a 206 Partial
      Response if they so choose to do so. Previously an attempt to cache a 206
      was arbitrarily allowed if the response contained an Expires or
@@ -225,7 +229,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewvc?rev=955966&view=rev
       Backport version for 2.2.x of patch:
          Trunk version of patch works
-      +1: rpluem,
+      +1: rpluem, trawick
 
   *) mod_rewrite: Allow to set environment variables using mod_rewrite without
      explicitely giving a value.
@@ -239,11 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~rjung/patches/httpd-branch-2.2-mod_rewrite-env_var-emptyvalue.patch
      +1: rjung
 
-  *) core authnz: improve misleading error message.  PR 38322.
-     Trunk: N/A
-     2.2.x: https://issues.apache.org/bugzilla/attachment.cgi?id=25698
-     +1: niq,pgollucci
-
   *) mod_filter: enable filtering of errordocuments.  PR 48377
      http://svn.apache.org/viewvc?view=revision&revision=894041
      +1: niq