remote-curl: unset CURLOPT_FAILONERROR

By not setting CURLOPT_FAILONERROR, curl parses the HTTP response
headers even if the response is an error. This makes GIT_CURL_VERBOSE to
show the HTTP headers, which is useful for debugging.

Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote-curl.c b/remote-curl.c
index d4673b6e8ccab241072b5577d914612acf675b04..91b39ca0988c154a576f753179c79628d2305435 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -547,6 +547,7 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
 
 struct rpc_in_data {
        struct rpc_state *rpc;
 
 struct rpc_in_data {
        struct rpc_state *rpc;

+       struct active_request_slot *slot;

 };
 
 /*
 };
 
 /*


@@ -558,6 +559,13 @@ static size_t rpc_in(char *ptr, size_t eltsize,
 {
        size_t size = eltsize * nmemb;
        struct rpc_in_data *data = buffer_;
 {
        size_t size = eltsize * nmemb;
        struct rpc_in_data *data = buffer_;

+       long response_code;
+
+       if (curl_easy_getinfo(data->slot->curl, CURLINFO_RESPONSE_CODE,
+                             &response_code) != CURLE_OK)
+               return size;
+       if (response_code >= 300)
+               return size;

        if (size)
                data->rpc->any_written = 1;
        write_or_die(data->rpc->in, ptr, size);
        if (size)
                data->rpc->any_written = 1;
        write_or_die(data->rpc->in, ptr, size);


@@ -774,7 +782,9 @@ static int post_rpc(struct rpc_state *rpc)
        curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
        curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in);
        rpc_in_data.rpc = rpc;
        curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
        curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in);
        rpc_in_data.rpc = rpc;

+       rpc_in_data.slot = slot;

        curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data);
        curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data);

+       curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0);

 
 
        rpc->any_written = 0;
 
 
        rpc->any_written = 0;