You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/09/11 22:29:39 UTC
svn commit: r1383602 - in /subversion/branches/1.7.x-r1383483: ./
subversion/libsvn_ra_serf/options.c subversion/libsvn_ra_serf/util.c
Author: cmpilato
Date: Tue Sep 11 20:29:39 2012
New Revision: 1383602
URL: http://svn.apache.org/viewvc?rev=1383602&view=rev
Log:
On the '1.7.x-r1383483' branch, merge from trunk r1383483.
Modified:
subversion/branches/1.7.x-r1383483/ (props changed)
subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/options.c
subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/util.c
Propchange: subversion/branches/1.7.x-r1383483/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1383483
Modified: subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/options.c?rev=1383602&r1=1383601&r2=1383602&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/options.c Tue Sep 11 20:29:39 2012
@@ -332,7 +332,8 @@ capabilities_headers_iterator_callback(v
if (svn_cstring_casecmp(key, SVN_DAV_ROOT_URI_HEADER) == 0)
{
orc->session->repos_root = orc->session->session_url;
- orc->session->repos_root.path = apr_pstrdup(orc->session->pool, val);
+ orc->session->repos_root.path =
+ (char *)svn_fspath__canonicalize(val, orc->session->pool);
orc->session->repos_root_str =
svn_urlpath__canonicalize(
apr_uri_unparse(orc->session->pool,
Modified: subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/util.c?rev=1383602&r1=1383601&r2=1383602&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.7.x-r1383483/subversion/libsvn_ra_serf/util.c Tue Sep 11 20:29:39 2012
@@ -2160,7 +2160,8 @@ svn_ra_serf__discover_vcc(const char **v
/* Now recreate the root_url. */
session->repos_root = session->session_url;
- session->repos_root.path = apr_pstrdup(session->pool, url_buf->data);
+ session->repos_root.path =
+ (char *)svn_fspath__canonicalize(url_buf->data, session->pool);
session->repos_root_str =
svn_urlpath__canonicalize(apr_uri_unparse(session->pool,
&session->repos_root, 0),