svn commit: r1203653 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

[stsp]

Author: stsp
Date: Fri Nov 18 14:16:08 2011
New Revision: 1203653

URL: http://svn.apache.org/viewvc?rev=1203653&view=rev
Log:
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.

Modified:
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1203653&r1=1203652&r2=1203653&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Fri Nov 18 14:16:08 
2011
@@ -221,7 +221,8 @@ merge_dir_config(apr_pool_t *p, void *ba
     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;