svn commit: r1447426 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_rewrite.c

[co...@apache.org]

Author: covener
Date: Mon Feb 18 18:46:23 2013
New Revision: 1447426

URL: http://svn.apache.org/r1447426
Log:
Unbreak default case of RewriteBase not being set after r1410681

Contributed By: Evgeny Barsukov
Reviewed By: covener

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1447426&r1=1447425&r2=1447426&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Feb 18 18:46:23 2013
@@ -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. 

Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=1447426&r1=1447425&r2=1447426&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Mon Feb 18 18:46:23 2013
@@ -2829,6 +2829,9 @@ static void *config_perdir_merge(apr_poo
         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;