From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 14 Sep 2009 20:35:19 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.14~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab38344c760c9f5866e2ca8b46cf431e64187a6d;p=thirdparty%2Fapache%2Fhttpd.git

* Promote


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

diff --git a/STATUS b/STATUS
index 8ac9260cc3f..f0b7e962cef 100644
--- a/STATUS
+++ b/STATUS
@@ -107,6 +107,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    +1: covener, poirier
    +1: minfrin (with r814779 for compiler warning fix)
 
+ * htdbm: Avoid buffer overflows.
+   PR: 30586
+   Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=797563
+                  http://svn.apache.org/viewvc?view=rev&revision=814781
+                  http://svn.apache.org/viewvc?view=rev&revision=814792
+   2.2.x patch: http://people.apache.org/~poirier/patch3-2.2.x-PR30586.txt
+   +1: poirier, minfrin, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -140,14 +148,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x Patch: http://people.apache.org/~minfrin/ssl-env.diff
    +1: minfrin
 
- * htdbm: Avoid buffer overflows.
-   PR: 30586
-   Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=797563
-                  http://svn.apache.org/viewvc?view=rev&revision=814781
-                  http://svn.apache.org/viewvc?view=rev&revision=814792
-   2.2.x patch: http://people.apache.org/~poirier/patch3-2.2.x-PR30586.txt
-   +1: poirier, minfrin, rpluem
-
  * mod_ldap: hints in usage for LDAPCacheEntries and LDAPOpCacheEntries
    updated to match manual and code (0 or -1 to disable)
    PR 40948