Sync with 2.34.8

[thirdparty/git.git] / http-push.c

diff --git a/http-push.c b/http-push.c
index b6db3b9043797a66274b510eb332dfb4675ddf52..b4aeae9e2695369c648ba615e182ab5c3f08561b 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -203,10 +203,8 @@ static void curl_setup_http(CURL *curl, const char *url,
        curl_easy_setopt(curl, CURLOPT_INFILE, buffer);
        curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len);
        curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
-#ifndef NO_CURL_SEEK
        curl_easy_setopt(curl, CURLOPT_SEEKFUNCTION, seek_buffer);
        curl_easy_setopt(curl, CURLOPT_SEEKDATA, buffer);
-#endif
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
        curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
        curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
@@ -249,8 +247,6 @@ static void process_response(void *callback_data)
        finish_request(request);
 }
 
-#ifdef USE_CURL_MULTI
-
 static void start_fetch_loose(struct transfer_request *request)
 {
        struct active_request_slot *slot;
@@ -299,7 +295,6 @@ static void start_mkcol(struct transfer_request *request)
                FREE_AND_NULL(request->url);
        }
 }
-#endif
 
 static void start_fetch_packed(struct transfer_request *request)
 {
@@ -605,7 +600,6 @@ static void finish_request(struct transfer_request *request)
        }
 }
 
-#ifdef USE_CURL_MULTI
 static int is_running_queue;
 static int fill_active_slot(void *unused)
 {
@@ -629,7 +623,6 @@ static int fill_active_slot(void *unused)
        }
        return 0;
 }
-#endif
 
 static void get_remote_object_list(unsigned char parent);
 
@@ -658,10 +651,8 @@ static void add_fetch_request(struct object *obj)
        request->next = request_queue_head;
        request_queue_head = request;
 
-#ifdef USE_CURL_MULTI
        fill_active_slots();
        step_active_slots();
-#endif
 }
 
 static int add_send_request(struct object *obj, struct remote_lock *lock)
@@ -696,10 +687,8 @@ static int add_send_request(struct object *obj, struct remote_lock *lock)
        request->next = request_queue_head;
        request_queue_head = request;
 
-#ifdef USE_CURL_MULTI
        fill_active_slots();
        step_active_slots();
-#endif
 
        return 1;
 }
@@ -894,7 +883,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
        slot->results = &results;
        curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer);
        curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
-       curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+       curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
 
        CALLOC_ARRAY(lock, 1);
        lock->timeout = -1;
@@ -1153,7 +1142,7 @@ static void remote_ls(const char *path, int flags,
        curl_setup_http(slot->curl, url, DAV_PROPFIND,
                        &out_buffer, fwrite_buffer);
        curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
-       curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+       curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
 
        if (start_active_slot(slot)) {
                run_active_slot(slot);
@@ -1227,7 +1216,7 @@ static int locking_available(void)
        curl_setup_http(slot->curl, repo->url, DAV_PROPFIND,
                        &out_buffer, fwrite_buffer);
        curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
-       curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+       curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
 
        if (start_active_slot(slot)) {
                run_active_slot(slot);
@@ -1682,21 +1671,15 @@ static int delete_remote_branch(const char *pattern, int force)
 
 static void run_request_queue(void)
 {
-#ifdef USE_CURL_MULTI
        is_running_queue = 1;
        fill_active_slots();
        add_fill_function(NULL, fill_active_slot);
-#endif
        do {
                finish_all_active_slots();
-#ifdef USE_CURL_MULTI
                fill_active_slots();
-#endif
        } while (request_queue_head && !aborted);
 
-#ifdef USE_CURL_MULTI
        is_running_queue = 0;
-#endif
 }
 
 int cmd_main(int argc, const char **argv)
@@ -1770,10 +1753,6 @@ int cmd_main(int argc, const char **argv)
                break;
        }
 
-#ifndef USE_CURL_MULTI
-       die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
-#endif
-
        if (!repo->url)
                usage(http_push_usage);
 
@@ -1786,9 +1765,7 @@ int cmd_main(int argc, const char **argv)
 
        http_init(NULL, repo->url, 1);
 
-#ifdef USE_CURL_MULTI
        is_running_queue = 0;
-#endif
 
        /* Verify DAV compliance/lock support */
        if (!locking_available()) {