67c67
< " - using serf %d.%d.%d")
---
> " - using serf %d.%d.%d (compiled with %d.%d.%d)")
76c76,81
< return apr_psprintf(pool, _(RA_SERF_DESCRIPTION_VER), major, minor, patch);
---
> return apr_psprintf(pool, _(RA_SERF_DESCRIPTION_VER),
> major, minor, patch,
> SERF_MAJOR_VERSION,
> SERF_MINOR_VERSION,
> SERF_PATCH_VERSION
> );
512,524c517,518
< status = apr_uri_parse(serf_sess->pool, session_URL, &url);
< if (status)
< {
< return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
< _("Illegal URL '%s'"),
< session_URL);
< }
< /* Depending the version of apr-util in use, for root paths url.path
< will be NULL or "", where serf requires "/". */
< if (url.path == NULL || url.path[0] == '\0')
< {
< url.path = apr_pstrdup(serf_sess->pool, "/");
< }
---
> SVN_ERR(svn_ra_serf__uri_parse(&url, session_URL, serf_sess->pool));
>
744,747c738,740
< status = apr_uri_parse(result_pool, new_sess->repos_root_str,
< &new_sess->repos_root);
< if (status)
< return svn_ra_serf__wrap_err(status, NULL);
---
> SVN_ERR(svn_ra_serf__uri_parse(&new_sess->repos_root,
> new_sess->repos_root_str,
> result_pool));
751,752c744,746
< status = apr_uri_parse(result_pool, new_sess->session_url_str,
< &new_sess->session_url);
---
> SVN_ERR(svn_ra_serf__uri_parse(&new_sess->session_url,
> new_sess->session_url_str,
> result_pool));
754,756d747
< if (status)
< return svn_ra_serf__wrap_err(status, NULL);
<
802d792
< apr_status_t status;
824,829c814
< status = apr_uri_parse(pool, url, &new_url);
< if (status)
< {
< return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
< _("Illegal repository URL '%s'"), url);
< }
---
> SVN_ERR(svn_ra_serf__uri_parse(&new_url, url, pool));
831,832d815
< /* Depending the version of apr-util in use, for root paths url.path
< will be NULL or "", where serf requires "/". */
835,842c818
< if (new_url.path == NULL || new_url.path[0] == '\0')
< {
< session->session_url.path = apr_pstrdup(session->pool, "/");
< }
< else
< {
< session->session_url.path = apr_pstrdup(session->pool, new_url.path);
< }
---
> session->session_url.path = apr_pstrdup(session->pool, new_url.path);