Merge r1410681:

   * mod_rewrite: PR53963: Ad an opt-in RewriteOption to control merging of RewriteBase
                  (This merge started happening in 2.4.0/2.2.23)

Submitted by: covener
Reviewed by: covener, minfrin, sf

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

diff --git a/CHANGES b/CHANGES
index df167f1b8e7d0bd86c022c72e5e781f4fc4ece68..a12c2654cae2ecba7bebe4b45b81abad7b475fd9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.4
 
+  *) mod_rewrite: Stop mergeing RewriteBase down to subdirectories
+     unless new option 'RewriteOptions MergeBase' is configured.
+     PR 53963. [Eric Covener]
+
   *) mod_status, mod_info, mod_proxy_ftp, mod_proxy_balancer, mod_imagemap,
      mod_ldap: Improve escaping of hostname and URIs HTML output.
      [Jim Jagielski, Stefan Fritsch]

diff --git a/STATUS b/STATUS
index f9e40e6d0ca57b0c6d333bb54302381e38a2591e..ba69a19422352aa243339fbe80982b33bc61d21a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -91,12 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_rewrite: PR53963: Ad an opt-in RewriteOption to control merging of RewriteBase
-                  (This merge started happening in 2.4.3/2.2.23)
-     trunk patch: http://svn.apache.org/viewvc?rev=1410681&view=rev
-     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-rewritebase_optional.diff
-     +1 covener, minfrin, sf
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 0479e5e721f1324aed1eb11bf4e8233ae20b4223..066a21a15346b5efdf7668c9dc34375a339cfec5 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -220,6 +220,16 @@ later</compatibility>
       </note>
       </dd>
 
+      <dt><code>MergeBase</code></dt>
+      <dd>
+
+      <p>With this option, the value of <directive module="mod_rewrite"
+      >RewriteBase</directive> is copied from where it's explicitly defined
+      into any sub-directory or sub-location that doesn't define its own
+      <directive module="mod_rewrite">RewriteBase</directive>. This was the
+      default behavior in 2.4.0 thorugh 2.4.3, and the flag to restore it is
+      available Apache HTTP Server 2.4.4 and later.</p>
+      </dd>
       </dl>
 
 </usage>

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 9823a7fa9d8e9af4a616ee92d749a2ce5aca091b..2193bfd0eef89d7a519871b7e2d3b5aae4c4ea7b 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -191,6 +191,7 @@ static const char* really_last_key = "rewrite_really_last";
 #define OPTION_INHERIT_BEFORE       1<<2
 #define OPTION_NOSLASH              1<<3
 #define OPTION_ANYURI               1<<4
+#define OPTION_MERGEBASE            1<<5
 
 #ifndef RAND_MAX
 #define RAND_MAX 32767
@@ -2821,8 +2822,11 @@ static void *config_perdir_merge(apr_pool_t *p, void *basev, void *overridesv)
     a->state_set = overrides->state_set || base->state_set;
     a->options = (overrides->options_set == 0) ? base->options : overrides->options;
     a->options_set = overrides->options_set || base->options_set;
-    a->baseurl = (overrides->baseurl_set == 0) ? base->baseurl : overrides->baseurl;
-    a->baseurl_set = overrides->baseurl_set || base->baseurl_set;
+
+    if (a->options & OPTION_MERGEBASE) { 
+        a->baseurl = (overrides->baseurl_set == 0) ? base->baseurl : overrides->baseurl;
+        a->baseurl_set = overrides->baseurl_set || base->baseurl_set;
+    }
 
     a->directory  = overrides->directory;
 
@@ -2897,6 +2901,9 @@ static const char *cmd_rewriteoptions(cmd_parms *cmd,
         else if (!strcasecmp(w, "allowanyuri")) {
             options |= OPTION_ANYURI;
         }
+        else if (!strcasecmp(w, "mergebase")) {
+            options |= OPTION_MERGEBASE;
+        }
         else {
             return apr_pstrcat(cmd->pool, "RewriteOptions: unknown option '",
                                w, "'", NULL);