* Promote

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

diff --git a/STATUS b/STATUS
index 564b160ce0f6f45a1b0553791ed8740c4a931bd3..01277aa5ce30a7d1645a9e502fdd623a767c940f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,6 +95,31 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      trunk patch applies
    +1: trawick, covener, niq
 
+ * mod_ext_filter: Include recently added TranslateAllMimeTypes option 
+   to this AP_INIT_ITERATE parameter (the help message parameter)
+      http://svn.apache.org/viewvc?rev=631342&view=rev
+   +1: covener, trawick, rpluem
+
+ * mod_headers: Add merge option to avoid duplicate values within
+   the same header.
+   Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=568323
+       http://svn.apache.org/viewvc?view=rev&revision=568879
+   Backport version for 2.2.x of patch:
+       http://people.apache.org/~chrisd/patches/mod_headers_merge/mod_headers-merge-2.2.x.patch
+   +1: chrisd, niq, rpluem
+
+ * mod_authn_dbd: Disambiguate and tidy database authentication
+   error messages.  Also move assignment statements after #if blocks
+   to avoid having them treated as variable declarations.
+   PR: 43210.
+   Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=639079
+       http://svn.apache.org/viewvc?view=rev&revision=468042
+   Backport version for 2.2.x of patch:
+       http://people.apache.org/~chrisd/patches/mod_authn_dbd_msgs/mod_authn_dbd-msgs-2.2.x.patch
+   +1: chrisd, niq, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -161,11 +186,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    rpluem says: I am missing a minor bump and documentation.
    niq replies: Done.
 
- * mod_ext_filter: Include recently added TranslateAllMimeTypes option 
-   to this AP_INIT_ITERATE parameter (the help message parameter)
-      http://svn.apache.org/viewvc?rev=631342&view=rev
-   +1: covener, trawick, rpluem
-
  * ApacheMonitor (win32); Sync to current trunk/.  This would
    Introduce the --kill flag, for use by the installer, solve
    a leak when using ApacheMonitor against another machine,
@@ -195,26 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://people.apache.org/~jim/patches/proxy-ssl-44026-patch.txt
    +1: jim, rpluem
 
- * mod_headers: Add merge option to avoid duplicate values within
-   the same header.
-   Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=568323
-       http://svn.apache.org/viewvc?view=rev&revision=568879
-   Backport version for 2.2.x of patch:
-       http://people.apache.org/~chrisd/patches/mod_headers_merge/mod_headers-merge-2.2.x.patch
-   +1: chrisd, niq, rpluem
-
- * mod_authn_dbd: Disambiguate and tidy database authentication
-   error messages.  Also move assignment statements after #if blocks
-   to avoid having them treated as variable declarations.
-   PR: 43210.
-   Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=639079
-       http://svn.apache.org/viewvc?view=rev&revision=468042
-   Backport version for 2.2.x of patch:
-       http://people.apache.org/~chrisd/patches/mod_authn_dbd_msgs/mod_authn_dbd-msgs-2.2.x.patch
-   +1: chrisd, niq, rpluem
-
  * mod_proxy: Add in 'disablereuse' option for parity with similar
    mod_jk functionality.
    Trunk version of patch: