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

Propose.


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

diff --git a/STATUS b/STATUS
index f4b9a986da0..493d13ee4bb 100644
--- a/STATUS
+++ b/STATUS
@@ -191,6 +191,17 @@ 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
+                  plus backport of r1447426 (2.4.x STATUS)
+     2.2.x patch: http://people.apache.org/~rjung/patches/rewriteoption-mergebase-2_2.patch
+     +1: rjung
+
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of