subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1866738 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
Date Tue, 10 Sep 2019 11:47:53 GMT
Author: julianfoad
Date: Tue Sep 10 11:47:53 2019
New Revision: 1866738

URL: http://svn.apache.org/viewvc?rev=1866738&view=rev
Log:
Add a hint about mod_dav_svn misconfiguration.

* subversion/mod_dav_svn/mod_dav_svn.c
  (merge_dir_config): When warning about an overlapping configuration,
    if the two configuration blocks are for the same URL then hint that
    the problem may be including the same config twice.

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=1866738&r1=1866737&r2=1866738&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Tue Sep 10 11:47:53 2019
@@ -292,10 +292,14 @@ merge_dir_config(apr_pool_t *p, void *ba
   if (parent->fs_path)
     ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
                  "mod_dav_svn: Location '%s' hinders access to '%s' "
-                 "in parent SVNPath Location '%s'",
+                 "in parent SVNPath Location '%s'%s",
                  child->root_dir,
                  svn_urlpath__skip_ancestor(parent->root_dir, child->root_dir),
-                 parent->root_dir);
+                 parent->root_dir,
+                 (strcmp(child->root_dir, parent->root_dir) == 0)
+                   ? " (or the subversion-specific configuration"
+                     " is included twice into httpd.conf)"
+                   : "");
 
   return newconf;
 }



Mime
View raw message