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/trunk@1447426 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 24c46bc37eea2ec9da59066b1de6632fa8b8b10d..d42087e0e623ad60af9c9e38747af1e29b1af180 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_rewrite: fix recent regression that caused RewriteBase to be ignored.
+    [Evgeny Barsukov <charlie.barkin gmail.com>]
+
   *) core: ap_rgetline_core now pulls from r->proto_input_filters.
 
   *) mod_proxy_html: process parsed comments immediately. 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index cd293013d7060c4f3deabdaf7e9dc85869a60206..4fa90546c1ed2ffa207f069a8782bf703a9cae28 100644 (file)
--- 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;