From: Jim Jagielski <jim@apache.org>
Date: Mon, 20 Jul 2009 10:41:21 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.12~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70934f75689da6c4c88a8f216b6f9545cbef1c4e;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 5e10e4abc03..2759715e43d 100644
--- a/STATUS
+++ b/STATUS
@@ -85,6 +85,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_include: fix potential segfault in get_include_var
+   http://markmail.org/message/jlc7t5edsjujbe37
+   Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=795445
+                http://svn.apache.org/viewvc?view=rev&revision=795446
+   2.2.x patch: http://people.apache.org/~niq/patches/mod_include_get_include_var.patch
+   +1: niq, minfrin, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -131,13 +138,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x patch: http://people.apache.org/~fuankg/diffs/gen_test_char.c.diff
    +1: fuankg
 
- * mod_include: fix potential segfault in get_include_var
-   http://markmail.org/message/jlc7t5edsjujbe37
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=795445
-                http://svn.apache.org/viewvc?view=rev&revision=795446
-   2.2.x patch: http://people.apache.org/~niq/patches/mod_include_get_include_var.patch
-   +1: niq, minfrin, jim
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre