From: Jim Jagielski <jim@apache.org>
Date: Wed, 13 Dec 2006 14:09:05 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.2.4~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67449661699b6423870492fa645116aa3c481da9;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index c57b02a9e63..9d2fef166ea 100644
--- a/STATUS
+++ b/STATUS
@@ -78,6 +78,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
+      Trunk: http://svn.apache.org/viewvc?view=rev&revision=450070
+      +1: minfrin, jim, wrowe
+        wrowe asks; should ptr mobj->m be nulled out for safety's sake?
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.
@@ -173,11 +178,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
            make more sense, permit direct Reverse'als when appropriate and
            restrict the Substitutions to be parsed only when required.
 
-    * mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
-      Trunk: http://svn.apache.org/viewvc?view=rev&revision=450070
-      +1: minfrin, jim, wrowe
-        wrowe asks; should ptr mobj->m be nulled out for safety's sake?
-
    * mod_authn_dbd: Export any additional columns queried in the SQL select
      into the environment with the name AUTHENTICATE_<COLUMN>. This brings
      mod_authn_dbd behaviour in line with mod_authnz_ldap.