From: Paul Querna <pquerna@apache.org>
Date: Sat, 1 Apr 2006 18:38:41 +0000 (+0000)
Subject: Move up accepted patches.
X-Git-Tag: 2.2.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf0abc07dabb59eba19cc7313d1faf99975ac80;p=thirdparty%2Fapache%2Fhttpd.git

Move up accepted patches.


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

diff --git a/STATUS b/STATUS
index e75a74b1634..bffca20db68 100644
--- a/STATUS
+++ b/STATUS
@@ -83,23 +83,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: rpluem, jim, pquerna
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-
-    * mod_dbd: When threaded, create a private pool in child_init
-      so we're not using the process pool later.  Also improve
-      configuration defaults and merge function.
-      (this assumes Colm's windows-build fixes are also backported)
-      http://svn.apache.org/viewcvs.cgi?rev=348026&view=rev
-      http://svn.apache.org/viewcvs.cgi?rev=354400&view=rev
-      +1 niq, trawick
-
-    * Backport mod_authz_dbd (it's had some testing now)
-      http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
-      +1 niq
-      -1 bnicholes - The authorization refactoring that was done is for 2.3 and above.
-                     This can not be backported to 2.2.
-
     * mod_isapi: Trivial compiler emit fixes for const'ness - noticed on OS/X
       Correct lvalue assignments (lvalue casts not allowed) - noticed on Sol.
       Resolve use of SetLastError with apr_set_os_error() and axe MAKEFILE
@@ -124,3 +107,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                     request / complains for this feature). See also
                     http://mail-archives.apache.org/mod_mbox/httpd-dev/200603.mbox/%3c200603092321.k29NLIi05689@devsys.jaguNET.com%3e
 
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+
+    * mod_dbd: When threaded, create a private pool in child_init
+      so we're not using the process pool later.  Also improve
+      configuration defaults and merge function.
+      (this assumes Colm's windows-build fixes are also backported)
+      http://svn.apache.org/viewcvs.cgi?rev=348026&view=rev
+      http://svn.apache.org/viewcvs.cgi?rev=354400&view=rev
+      +1 niq, trawick
+
+    * Backport mod_authz_dbd (it's had some testing now)
+      http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
+      +1 niq
+      -1 bnicholes - The authorization refactoring that was done is for 2.3 and above.
+                     This can not be backported to 2.2.
+