You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ka...@apache.org on 2010/03/01 14:15:58 UTC
svn commit: r917512 - in /subversion/trunk/subversion/mod_dav_svn: mirror.c
mod_dav_svn.c
Author: kameshj
Date: Mon Mar 1 13:15:58 2010
New Revision: 917512
URL: http://svn.apache.org/viewvc?rev=917512&view=rev
Log:
Follow-up to r916286.
* subversion/mod_dav_svn/mod_dav_svn.c
(create_dir_config):
* subversion/mod_dav_svn/mirror.c
(dav_svn__location_in_filter, dav_svn__location_body_filter):
Use 'svn_uri_canonicalize' on url paths.
Found by: julianfoad, rhuijben
Modified:
subversion/trunk/subversion/mod_dav_svn/mirror.c
subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
Modified: subversion/trunk/subversion/mod_dav_svn/mirror.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mirror.c?rev=917512&r1=917511&r2=917512&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mirror.c Mon Mar 1 13:15:58 2010
@@ -144,7 +144,7 @@
apr_uri_parse(r->pool, master_uri, &uri);
root_dir = dav_svn__get_root_dir(r);
if (uri.path)
- canonicalized_uri = svn_dirent_canonicalize(uri.path, r->pool);
+ canonicalized_uri = svn_uri_canonicalize(uri.path, r->pool);
else
canonicalized_uri = uri.path;
if (strcmp(canonicalized_uri, root_dir) == 0) {
@@ -260,7 +260,7 @@
apr_uri_parse(r->pool, master_uri, &uri);
root_dir = dav_svn__get_root_dir(r);
if (uri.path)
- canonicalized_uri = svn_dirent_canonicalize(uri.path, r->pool);
+ canonicalized_uri = svn_uri_canonicalize(uri.path, r->pool);
else
canonicalized_uri = uri.path;
if (strcmp(canonicalized_uri, root_dir) == 0) {
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=917512&r1=917511&r2=917512&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Mon Mar 1 13:15:58 2010
@@ -170,7 +170,7 @@
dir_conf_t *conf = apr_pcalloc(p, sizeof(*conf));
if (dir)
- conf->root_dir = svn_dirent_canonicalize(dir, p);
+ conf->root_dir = svn_uri_canonicalize(dir, p);
conf->bulk_updates = CONF_FLAG_ON;
conf->v2_protocol = CONF_FLAG_ON;
Re: svn commit: r917512 - in /subversion/trunk/subversion/mod_dav_svn:
mirror.c mod_dav_svn.c
Posted by Blair Zajac <bl...@orcaware.com>.
Kamesh Jayachandran wrote:
> Modified as suggested.
Thanks!
Blair
RE: svn commit: r917512 - in /subversion/trunk/subversion/mod_dav_svn: mirror.c mod_dav_svn.c
Posted by Kamesh Jayachandran <ka...@collab.net>.
Modified as suggested.
Thanks
With regards
Kamesh Jayachandran
-----Original Message-----
From: Blair Zajac [mailto:blair@orcaware.com]
Sent: Mon 3/1/2010 10:47 PM
To: kameshj@apache.org
Cc: dev@subversion.apache.org
Subject: Re: svn commit: r917512 - in /subversion/trunk/subversion/mod_dav_svn: mirror.c mod_dav_svn.c
kameshj@apache.org wrote:
> Author: kameshj
> Date: Mon Mar 1 13:15:58 2010
> New Revision: 917512
>
> URL: http://svn.apache.org/viewvc?rev=917512&view=rev
> Log:
> Follow-up to r916286.
>
> * subversion/mod_dav_svn/mod_dav_svn.c
> (create_dir_config):
> * subversion/mod_dav_svn/mirror.c
> (dav_svn__location_in_filter, dav_svn__location_body_filter):
> Use 'svn_uri_canonicalize' on url paths.
A minor comment on the log messages. The lines beginning with () are indented
two spaces and each source file has one vertical whitespace separating it from
other files. This makes it much easier to visually parse the log message to
quickly see what's being changed:
* subversion/mod_dav_svn/mod_dav_svn.c
(create_dir_config):
Use 'svn_uri_canonicalize' on url paths.
* subversion/mod_dav_svn/mirror.c
(dav_svn__location_in_filter, dav_svn__location_body_filter):
Use 'svn_uri_canonicalize' on url paths.
Regards,
Blair
Re: svn commit: r917512 - in /subversion/trunk/subversion/mod_dav_svn:
mirror.c mod_dav_svn.c
Posted by Blair Zajac <bl...@orcaware.com>.
kameshj@apache.org wrote:
> Author: kameshj
> Date: Mon Mar 1 13:15:58 2010
> New Revision: 917512
>
> URL: http://svn.apache.org/viewvc?rev=917512&view=rev
> Log:
> Follow-up to r916286.
>
> * subversion/mod_dav_svn/mod_dav_svn.c
> (create_dir_config):
> * subversion/mod_dav_svn/mirror.c
> (dav_svn__location_in_filter, dav_svn__location_body_filter):
> Use 'svn_uri_canonicalize' on url paths.
A minor comment on the log messages. The lines beginning with () are indented
two spaces and each source file has one vertical whitespace separating it from
other files. This makes it much easier to visually parse the log message to
quickly see what's being changed:
* subversion/mod_dav_svn/mod_dav_svn.c
(create_dir_config):
Use 'svn_uri_canonicalize' on url paths.
* subversion/mod_dav_svn/mirror.c
(dav_svn__location_in_filter, dav_svn__location_body_filter):
Use 'svn_uri_canonicalize' on url paths.
Regards,
Blair