Re: [PATCH 1/2] http-push: send opaquelocktoken in If: for PUT requests
- From
Ray Chuan <rctay89@gmail.com>
- Date
- Jan 17, 2009, 20:14 UTC
- Message-ID
- <be6fef0d0901171214h44b80a5drd2dd11f2bd65cf53@mail.gmail.com>
- In-Reply-To
- <be6fef0d0901171210o97a24carf902e82848d48b5d@mail.gmail.com>
oops, i incorrectly stated in the commit message that the request URL for PUT was modified; i apologize for that error.
On 1/17/09, Ray Chuan <rctay89@gmail.com> wrote:
Show 56 quoted lines
> Currently, git PUTs to
>
> /repo.git/objects/1a/1a2b...9z_opaquelocktoken:1234-....
>
> On some platforms, ':' isn't allowed in filenames so the PUT fails.
> This seems to be an (faulty) implementation of the opaquelocktoken URI
> scheme (http://www.webdav.org/specs/rfc4918.html#RFC2518).
>
> PUT now sends the object to the url
>
> /repo.git/objects/1a/1a2b...9z
>
> , without the trailing '_opaquelocktoken:1234-....', with an
> additional "If: (<opaquelocktoken:1234-....>)" header.
>
> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
> ---
> http-push.c | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/http-push.c b/http-push.c
> index c9ba07e..4517cf2 100644
> --- a/http-push.c
> +++ b/http-push.c
> @@ -480,7 +480,9 @@ static void start_put(struct transfer_request *request)
> {
> char *hex = sha1_to_hex(request->obj->sha1);
> struct active_request_slot *slot;
> + struct curl_slist *dav_headers = NULL;
> char *posn;
> + char *if_header;
> enum object_type type;
> char hdr[50];
> void *unpacked;
> @@ -535,6 +537,10 @@ static void start_put(struct transfer_request *request)
> *(posn++) = '_';
> strcpy(posn, request->lock->token);
>
> + if_header = xmalloc(strlen(request->lock->token) + 25);
> + sprintf(if_header, "If: <%s>", request->lock->token);
> + dav_headers = curl_slist_append(dav_headers, if_header);
> +
> slot = get_active_slot();
> slot->callback_func = process_response;
> slot->callback_data = request;
> @@ -546,6 +552,7 @@ static void start_put(struct transfer_request *request)
> curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
> curl_easy_setopt(slot->curl, CURLOPT_PUT, 1);
> curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
> + curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
> curl_easy_setopt(slot->curl, CURLOPT_URL, request->url);
>
> if (start_active_slot(slot)) {
> --
> 1.5.6.3
>-- Cheers, Ray Chuan