On Fri, Nov 18, 2011 at 03:07:11PM +0100, Stefan Sperling wrote:
> On Fri, Nov 18, 2011 at 02:52:44PM +0100, Stefan Sperling wrote:
> > Suggestion (not tested);
> >
> > ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
> > "mod_dav_svn: nested Location '%s' inside "
> > "SVNPath Location '%s'; this hinders access to a file "
> > "or directory '%s' inside the repository '%s'",
> > child->root_dir, parent->root_dir,
> > svn_dirent_basename(child->root_dir, scratch_pool),
> > parent->fs_path);
>
> Better suggestion.
And a new patch, based on your r1203651 commit:
[[[
Follow-up to r1203651:
* subversion/mod_dav_svn/mod_dav_svn.c
(merge_dir_config): Use svn__fspath instead of svn_dirent for URL-paths.
Correctly print Locations nested more than 1 level deep.
]]]
Index: subversion/mod_dav_svn/mod_dav_svn.c
===================================================================
--- subversion/mod_dav_svn/mod_dav_svn.c (revision 1203651)
+++ subversion/mod_dav_svn/mod_dav_svn.c (working copy)
@@ -221,7 +221,8 @@ merge_dir_config(apr_pool_t *p, void *base, void *
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
"mod_dav_svn: nested Location '%s' hinders access to '%s' "
"in SVNPath Location '%s'",
- child->root_dir, svn_dirent_basename(child->root_dir, p),
+ child->root_dir,
+ svn_fspath__skip_ancestor(parent->root_dir, child->root_dir),
parent->root_dir);
return newconf;
