... and promote...

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

diff --git a/STATUS b/STATUS
index e731d5833fc879d0dca4f971c218397dcf4aec5d..d44477b4817a5de16fb86afa8312ba63089dee63 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -78,8 +78,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-
     * ab: Two minor fixes for PRs
       * 42070: sign mismatch in format string causes high server listening port
         numbers to be reported incorrectly. Subversion r526584
@@ -101,6 +99,25 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       
       +1: sctemme, rpluem, jim
 
+   * support/htdbm.c: Enable crypt() support on platforms with crypt() but not
+     <crypt.h>, such as z/OS.
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=526892
+     2.2.x version of patch:
+       Trunk version works
+     +1: trawick, rpluem, jim
+
+   * HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only
+     processing of error responses (4xx, 5xx) will be altered.  PR
+     39245.
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=527969
+     2.2.x version of patch:
+       Trunk version works
+     +1: trawick, rpluem, jim
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+
     * mod_proxy_ajp: Fix wrong retry when sending the response failed.
       PR 40310 (The old fix wasn't ok).
       Trunk version of patch:
@@ -181,23 +198,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      http://svn.apache.org/viewvc?rev=499567&view=rev
      +1: niq, rpluem
 
-   * support/htdbm.c: Enable crypt() support on platforms with crypt() but not
-     <crypt.h>, such as z/OS.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=526892
-     2.2.x version of patch:
-       Trunk version works
-     +1: trawick, rpluem, jim
-
-   * HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only
-     processing of error responses (4xx, 5xx) will be altered.  PR
-     39245.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=527969
-     2.2.x version of patch:
-       Trunk version works
-     +1: trawick, rpluem, jim
-
    * mod_cache: Correctly cache and recall entities whose request URL's
      are url-escaped.
         PR: 41475