32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
# ./pullrev.sh 1926683
|
|
http://svn.apache.org/viewvc?view=revision&revision=1926683
|
|
|
|
--- subversion-1.14.5/subversion/mod_dav_svn/mod_dav_svn.c
|
|
+++ subversion-1.14.5/subversion/mod_dav_svn/mod_dav_svn.c
|
|
@@ -781,7 +781,16 @@
|
|
dav_svn__get_root_dir(request_rec *r)
|
|
{
|
|
dir_conf_t *conf;
|
|
+#if AP_MODULE_MAGIC_AT_LEAST(20120211, 139)
|
|
+ const char *base;
|
|
|
|
+ /* Inherit the root path from mod_dav's DavBasePath iff configured
|
|
+ where e.g. LocationMatch is used for the repos. */
|
|
+ base = dav_get_base_path(r);
|
|
+ if (base)
|
|
+ return base;
|
|
+#endif
|
|
+
|
|
conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
|
|
return conf->root_dir;
|
|
}
|
|
@@ -1225,7 +1234,7 @@
|
|
else
|
|
{
|
|
/* Retrieve path to repo and within repo for the request */
|
|
- dav_error *err = dav_svn_split_uri(r, r->uri, conf->root_dir,
|
|
+ dav_error *err = dav_svn_split_uri(r, r->uri, dav_svn__get_root_dir(r),
|
|
&ignore_cleaned_uri,
|
|
&ignore_had_slash, &repos_basename,
|
|
&ignore_relative_path, &repos_path);
|