[PATCH] But with trailing slashes in SVNPath command in httpd.conf

Ben Collins-Sussman <sussman@collab.net> writes:

> Justin Clift <justin@postgresql.org> writes:
>
> > This works:
> >
> > <Location /foob>
> > DAV svn
> > SVNPath /usr/local/www/repos
> > </Location>
> >
> >
> > This generates an error:
> >
> > <Location /foob>
> > DAV svn
> > SVNPath /usr/local/www/repos
> > </Location>
>
> A bug in the bug report. The failing block looks like this:
>
> SVNPath /usr/local/www/repos/

I don't know much about mod_dav_svn, but this works for me. Does it
look OK?

* subversion/mod_dav_svn/mod_dav_svn.c
  (dav_svn_get_fs_path, dav_svn_get_fs_parent_path): Canonicalize paths.

Index: ../svn/subversion/mod_dav_svn/mod_dav_svn.c
===================================================================
--- ../svn/subversion/mod_dav_svn/mod_dav_svn.c
+++ ../svn/subversion/mod_dav_svn/mod_dav_svn.c Wed Sep 4 20:44:33 2002
@@ -210,7 +210,9 @@
     dav_svn_dir_conf *conf;
 
     conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
- return conf->fs_path;
+ return (conf->fs_path
+ ? svn_path_canonicalize_nts (conf->fs_path, r->pool)
+ : NULL);
 }
 
 const char *dav_svn_get_fs_parent_path(request_rec *r)
@@ -218,7 +220,9 @@
     dav_svn_dir_conf *conf;
 
     conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
- return conf->fs_parent_path;
+ return (conf->fs_parent_path
+ ? svn_path_canonicalize_nts (conf->fs_parent_path, r->pool)
+ : NULL);
 }
 
 

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org