From: Jeff Trawick <trawick@apache.org>
Date: Mon, 12 Dec 2011 15:35:00 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.22~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac8404f2d4431bd891ffe3a6bee3566461a11a2;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index f64dcf0f349..78335ddaf56 100644
--- a/STATUS
+++ b/STATUS
@@ -107,6 +107,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      and 2.4.x no longer support this version, see r1203491 and r1203495)
     +1: kbrand (non-binding), rjung, jorton
 
+  * core: Fix segfault in ap_send_interim_response(). PR 52315
+      Trunk patch: http://svn.apache.org/viewvc?rev=895483&view=rev
+      2.2.x patch: trunk patch works
+    +1: sf, trawick, minfrin
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -158,11 +163,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.2.x patch: trunk patch works
     +1: jorton
 
-  * core: Fix segfault in ap_send_interim_response(). PR 52315
-      Trunk patch: http://svn.apache.org/viewvc?rev=895483&view=rev
-      2.2.x patch: trunk patch works
-    +1: sf, trawick, minfrin
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of