You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/03/27 05:00:55 UTC
svn commit: r1461407 - in /subversion/branches/1.7.x: ./ STATUS
subversion/mod_dav_svn/mod_dav_svn.c
Author: svn-role
Date: Wed Mar 27 04:00:54 2013
New Revision: 1461407
URL: http://svn.apache.org/r1461407
Log:
Merge r1425368 from trunk:
* r1425368
Use the right api for generating the repository dirent in mod_dav_svn.
Justification:
Using dav_svn_get_repos_path() causes an assertion on Windows. This
public api was unused until the in-repo-authz was merged to trunk.
Votes:
+1: rhuijben, pburba, ivan
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/mod_dav_svn/mod_dav_svn.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1425368
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461407&r1=1461406&r2=1461407&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Mar 27 04:00:54 2013
@@ -281,11 +281,3 @@ Approved changes:
It's a SEGV.
Votes:
+1: philip, breser, stefan2
-
- * r1425368
- Use the right api for generating the repository dirent in mod_dav_svn.
- Justification:
- Using dav_svn_get_repos_path() causes an assertion on Windows. This
- public api was unused until the in-repo-authz was merged to trunk.
- Votes:
- +1: rhuijben, pburba, ivan
Modified: subversion/branches/1.7.x/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/mod_dav_svn/mod_dav_svn.c?rev=1461407&r1=1461406&r2=1461407&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/1.7.x/subversion/mod_dav_svn/mod_dav_svn.c Wed Mar 27 04:00:54 2013
@@ -573,7 +573,7 @@ dav_svn_get_repos_path(request_rec *r,
/* Construct the full path from the parent path base directory
and the repository name. */
- *repos_path = svn_urlpath__join(fs_parent_path, repos_name, r->pool);
+ *repos_path = svn_dirent_join(fs_parent_path, repos_name, r->pool);
return NULL;
}