[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Send path with lock token to fix issue 4369

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 31 May 2013 15:32:37 -0400

On 05/31/2013 03:17 PM, Philip Martin wrote:
> so how about this patch:
>
> Index: subversion/libsvn_ra_serf/commit.c
> ===================================================================
> --- subversion/libsvn_ra_serf/commit.c (revision 1488294)
> +++ subversion/libsvn_ra_serf/commit.c (working copy)
> @@ -804,8 +804,15 @@
> if (token)
> {
> const char *token_header;
> + const char *token_uri;
> + apr_uri_t uri = commit_ctx->session->session_url;
>
> - token_header = apr_pstrcat(pool, "(<", token, ">)", (char *)NULL);
> + uri.path = (char *)svn_path_url_add_component2(uri.path, relpath,
> + pool);
> + token_uri = apr_uri_unparse(pool, &uri, 0);
> +
> + token_header = apr_pstrcat(pool, "<", token_uri, "> (<", token, ">)",
> + (char *)NULL);
> serf_bucket_headers_set(headers, "If", token_header);
> }
> }

Looks sane to me.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development

Received on 2013-05-31 21:33:10 CEST

This is an archived mail posted to the Subversion Dev mailing list.