subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1203651 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
Date Fri, 18 Nov 2011 14:06:07 GMT
Author: philip
Date: Fri Nov 18 14:06:07 2011
New Revision: 1203651

URL: http://svn.apache.org/viewvc?rev=1203651&view=rev
Log:
Followup to r1203546, restore the partial support for nested Locations
but issue a warning.

* subversion/mod_dav_svn/mod_dav_svn.c
  (merge_dir_config): Don't set paths to NULL, tweak logged message.

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=1203651&r1=1203650&r2=1203651&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:06:07 2011
@@ -218,15 +218,11 @@ merge_dir_config(apr_pool_t *p, void *ba
   newconf->root_dir = INHERIT_VALUE(parent, child, root_dir);
 
   if (parent->fs_path)
-    {
-      /* Nesting inside SVNPath is ambiguous so prevent access. */
-      newconf->fs_path = newconf->fs_parent_path = NULL;
-
-      ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                   "mod_dav_svn: invalid nested Location '%s' inside "
-                   "SVNPath Location '%s'",
-                   child->root_dir, parent->root_dir);
-    }
+    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),
+                 parent->root_dir);
 
   return newconf;
 }



Mime
View raw message