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 19:22:09 UTC
svn commit: r1383483 - in /subversion/trunk/subversion/libsvn_ra_serf:
options.c util.c
Author: cmpilato
Date: Tue Sep 11 17:22:09 2012
New Revision: 1383483
URL: http://svn.apache.org/viewvc?rev=1383483&view=rev
Log:
Fix issue #4088 ("serf assertion with <Location />").
* subversion/libsvn_ra_serf/options.c
(capabilities_headers_iterator_callback): Ensure that
session->repos_root.path is an fspath.
* subversion/libsvn_ra_serf/util.c
(svn_ra_serf__discover_vcc): Ensure that session->repos_root.path is
an fspath.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/options.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1383483&r1=1383482&r2=1383483&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Tue Sep 11 17:22:09 2012
@@ -217,7 +217,8 @@ capabilities_headers_iterator_callback(v
if (svn_cstring_casecmp(key, SVN_DAV_ROOT_URI_HEADER) == 0)
{
session->repos_root = session->session_url;
- session->repos_root.path = apr_pstrdup(session->pool, val);
+ session->repos_root.path =
+ (char *)svn_fspath__canonicalize(val, session->pool);
session->repos_root_str =
svn_urlpath__canonicalize(
apr_uri_unparse(session->pool, &session->repos_root, 0),
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1383483&r1=1383482&r2=1383483&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Tue Sep 11 17:22:09 2012
@@ -2232,7 +2232,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),