From: Rainer Jung <rjung@apache.org>
Date: Mon, 18 Feb 2013 16:45:24 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.2.24~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0e96da0be6f27308d676b76edd78450fdc8970;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index 5d0a704cd5a..cb16f9e022b 100644
--- a/STATUS
+++ b/STATUS
@@ -94,6 +94,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * various mods: host and URI escaping. Includes needed constification
+     fix for mod_imagemap.
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1413732
+                  http://svn.apache.org/viewvc?view=revision&revision=1418752
+                  http://svn.apache.org/viewvc?view=revision&revision=1416889
+                  http://svn.apache.org/viewvc?view=revision&revision=1422234
+                  http://svn.apache.org/viewvc?view=revision&revision=1422253
+     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1418941
+                  http://svn.apache.org/viewvc?view=revision&revision=1425750
+     2.2.x patch: http://people.apache.org/~rjung/patches/host-and-uri-escaping-2_2.patch
+     +1: rjung, rpluem, wrowe
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -191,18 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      -1: wrowe (switch to +1 once ap_get_exec_line is made thread-safe)
                kudos for using apr_tokenize_to_argv to allow spaces in args.
 
-   * various mods: host and URI escaping. Includes needed constification
-     fix for mod_imagemap.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1413732
-                  http://svn.apache.org/viewvc?view=revision&revision=1418752
-                  http://svn.apache.org/viewvc?view=revision&revision=1416889
-                  http://svn.apache.org/viewvc?view=revision&revision=1422234
-                  http://svn.apache.org/viewvc?view=revision&revision=1422253
-     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1418941
-                  http://svn.apache.org/viewvc?view=revision&revision=1425750
-     2.2.x patch: http://people.apache.org/~rjung/patches/host-and-uri-escaping-2_2.patch
-     +1: rjung, rpluem, wrowe
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of