]> granicus.if.org Git - git/commitdiff
http-push.c: make CURLOPT_IOCTLDATA a usable pointer
authorAbbaad Haider <abbaad@gmail.com>
Sun, 6 Jul 2014 00:43:48 +0000 (20:43 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jul 2014 00:57:59 +0000 (17:57 -0700)
Fixes a small bug affecting push to remotes which use some sort of
multi-pass authentication. In particular the bug affected SabreDAV as
configured by Box.com [1].

It must be a weird server configuration for the bug to have survived
this long. Someone should write a test for it.

[1] http://marc.info/?l=git&m=140460482604482

Signed-off-by: Abbaad Haider <abbaad@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
http-push.c

index 34cb70f90ea14a18848bd270463f5a34dc2c8fd3..3bcf8073eee90f4905911f4bba5f9bddcfb13ca6 100644 (file)
@@ -200,7 +200,7 @@ static void curl_setup_http(CURL *curl, const char *url,
        curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
 #ifndef NO_CURL_IOCTL
        curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
-       curl_easy_setopt(curl, CURLOPT_IOCTLDATA, &buffer);
+       curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer);
 #endif
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
        curl_easy_setopt(curl, CURLOPT_NOBODY, 0);