[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-09-04 21:56:01 CEST

That patch looks good to me! Greg?

Philip Martin <philip@codematters.co.uk> writes:

> 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
Received on Wed Sep 4 21:59:27 2002

This is an archived mail posted to the Subversion Dev mailing list.