* The "Correctly error out if we get an error from upstream response." has

  been accepted for backport.

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

diff --git a/STATUS b/STATUS
index 4632942be7b7b145597a4bdfd55d66e4bcade647..002d1b6b61c4d952a91c514090b4a971a1c917c7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -100,22 +100,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       +1: rpluem, niq, jerenkrantz
       NOTE: this also supersedes previous fix to PR#37790
 
-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
-
-    * 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_proxy: Correctly error out if we get an error from upstream
       response.  Otherwise, we'll leave the client in a bad state.
       http://svn.apache.org/viewcvs.cgi?rev=354628&view=rev
@@ -150,6 +134,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://people.apache.org/~rpluem/patches/partial_2.2.diff
       +1: jim, rpluem, jerenkrantz
 
+
+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
+
+    * 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.
+
     * Fix mis-shifted 32 bit scope, masked to 64 bits as a method, with
       improvement (?) suggested by jorton;
         URL: http://people.apache.org/~wrowe/fixldap_mask.patch