From: Eric Covener <covener@apache.org>
Date: Mon, 18 Feb 2013 19:33:18 +0000 (+0000)
Subject: Contributed By: Evgeny Barsukov
X-Git-Tag: 2.4.4~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=854151d5bee4b39b4a900930f1b60c7ee2becb61;p=apache

Contributed By: Evgeny Barsukov
Reviewed By: covener, humbedooh, rjung

Merge r1447426 from trunk:

Unbreak default case of RewriteBase not being set after r1410681

Contributed By: Evgeny Barsukov
Reviewed By: covener



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

diff --git a/STATUS b/STATUS
index 038b255492..fd4150ae28 100644
--- a/STATUS
+++ b/STATUS
@@ -92,11 +92,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * mod_rewrite: RewriteBase setting lost during merge by default (recent regression backported)
-    trunk patch: http://svn.apache.org/r1447426
-    2.4.x patch: trunk works
-    +1 covener, rjung, humbedooh
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index cd293013d7..4fa90546c1 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2829,6 +2829,9 @@ static void *config_perdir_merge(apr_pool_t *p, void *basev, void *overridesv)
         a->baseurl = (overrides->baseurl_set == 0) ? base->baseurl : overrides->baseurl;
         a->baseurl_set = overrides->baseurl_set || base->baseurl_set;
     }
+    else { 
+        a->baseurl = overrides->baseurl;
+    }
 
     a->directory  = overrides->directory;