subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1000059 - /subversion/trunk/subversion/mod_dav_svn/version.c
Date Wed, 22 Sep 2010 16:06:07 GMT
Author: cmpilato
Date: Wed Sep 22 16:06:06 2010
New Revision: 1000059

URL: http://svn.apache.org/viewvc?rev=1000059&view=rev
Log:
Revert r989658 and r999503, the former of which takes the wrong
approach to fixing issue #3695 ("SVNPathAuthz short_circuit ignores
the authz path rules with repo prefix") and the latter of which made
minor variable scoping tweaks to the new code added by the former.

* subversion/mod_dav_svn/version.c
  (): Don't include mod_dav_svn.h -- we no longer need it.
  (deliver_report): Don't worry ourselves about a NULL repo_name.
    "These aren't the [bits] you're looking for."


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

Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1000059&r1=1000058&r2=1000059&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Sep 22 16:06:06 2010
@@ -41,7 +41,6 @@
 #include "private/svn_log.h"
 
 #include "dav_svn.h"
-#include "mod_dav_svn.h"
 
 
 svn_error_t *
@@ -1015,22 +1014,6 @@ deliver_report(request_rec *r,
 
   if (doc->root->ns == ns)
     {
-      /* If the "SVNPathAuthz short_circuit" directive is used,
-         resource->info->repos->repo_name becomes NULL.  */
-      if (resource->info->repos->repo_name == NULL)
-        {
-          const char *cleaned_uri, *relative_path, *repos_path;
-          int trailing_slash;
-          dav_error *err;
-
-          err = dav_svn_split_uri(r, r->uri, dav_svn__get_root_dir(r),
-                                  &cleaned_uri, &trailing_slash,
-                                  &(resource->info->repos->repo_name), 
-                                  &relative_path, &repos_path);
-          if (err)
-            return err;
-        }
-
       /* ### note that these report names should have symbols... */
 
       if (strcmp(doc->root->name, "update-report") == 0)



Mime
View raw message