From: Jim Jagielski <jim@apache.org>
Date: Tue, 6 Sep 2011 11:23:19 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.21~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc99e99d33283dc3ca7fd41344be786fe0dac18c;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 44329d3a262..d5b3552eca1 100644
--- a/STATUS
+++ b/STATUS
@@ -93,6 +93,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core: All the latest Range fixes through 1165268
+    Trunk patch: Revisions 1163819-1165268 of byterange_filter.c
+      (see http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/byterange_filter.c?view=log)
+    CHANGES entry for the critical issue in the patch:
+        *) Fix a regression in the CVE-2011-3192 byterange fix.
+           PR 51748. [low_priority <lowprio20 gmail.com>]
+    2.2.x patch: http://people.apache.org/~trawick/byterange_filter-1163819-through-1165268.txt
+    Diff between trunk r1165268 and 2.2.x with this patch:
+                 http://people.apache.org/~trawick/byterange_filter-1165268-2.2.x-vs-trunk.txt
+    +1: trawick, rpluem, jim
+
  PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -147,17 +158,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     sf agrees with covener. This can cause segfaults with some directives,
        see r1153676, r1153687.
 
-  * core: All the latest Range fixes through 1165268
-    Trunk patch: Revisions 1163819-1165268 of byterange_filter.c
-      (see http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/byterange_filter.c?view=log)
-    CHANGES entry for the critical issue in the patch:
-        *) Fix a regression in the CVE-2011-3192 byterange fix.
-           PR 51748. [low_priority <lowprio20 gmail.com>]
-    2.2.x patch: http://people.apache.org/~trawick/byterange_filter-1163819-through-1165268.txt
-    Diff between trunk r1165268 and 2.2.x with this patch:
-                 http://people.apache.org/~trawick/byterange_filter-1165268-2.2.x-vs-trunk.txt
-    +1: trawick, rpluem, jim
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of