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
[ 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 ]
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;