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

Promote.

I'm going to commit this soon.
We can revert if anyone wants to -1 it.


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

diff --git a/STATUS b/STATUS
index 686b7a1c14b..d14292a4346 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. ]
 
+   * mod_rewrite: Add an opt-in RewriteOption to control merging of RewriteBase.
+     Merging would be off by default, which is the same as the pre 2.2.23
+     behaviour.
+     PR 53963
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1410681
+                  http://svn.apache.org/viewvc?view=revision&revision=1447426
+     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1418954
+                  http://svn.apache.org/viewvc?view=revision&revision=1447448
+     2.2.x patch: http://people.apache.org/~rjung/patches/rewriteoption-mergebase-2_2.patch
+     +1: rjung, wrowe (same observation as covener) 
+     +1: covener (docs need tweak to note 2.2.23 instead of 2.4.0-2.4.3)
+
 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.
 
-   * mod_rewrite: Add an opt-in RewriteOption to control merging of RewriteBase.
-     Merging would be off by default, which is the same as the pre 2.2.23
-     behaviour.
-     PR 53963
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1410681
-                  http://svn.apache.org/viewvc?view=revision&revision=1447426
-     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1418954
-                  http://svn.apache.org/viewvc?view=revision&revision=1447448
-     2.2.x patch: http://people.apache.org/~rjung/patches/rewriteoption-mergebase-2_2.patch
-     +1: rjung, wrowe (same observation as covener) 
-     +1: covener (docs need tweak to note 2.2.23 instead of 2.4.0-2.4.3)
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of