Decide whether to build http-push in the Makefile

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

diff --git a/http-push.c b/http-push.c
index 293269395c90e5e5ec4b3bb06e02e7677da2dac5..76c788673e0a02c723d99976d3e605531341c7a9 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -6,8 +6,6 @@
 #include "blob.h"
 #include "http.h"
 
-#ifdef USE_CURL_MULTI
-
 #include <expat.h>
 
 static const char http_push_usage[] =
@@ -165,6 +163,7 @@ static void start_check(struct transfer_request *request)
        } else {
                request->state = ABORTED;
                free(request->url);
+               request->url = NULL;
        }
 }
 
@@ -198,6 +197,7 @@ static void start_mkcol(struct transfer_request *request)
        } else {
                request->state = ABORTED;
                free(request->url);
+               request->url = NULL;
        }
 }
 
@@ -244,8 +244,6 @@ static void start_put(struct transfer_request *request)
        request->buffer.size = stream.total_out;
        request->buffer.posn = 0;
 
-       if (request->url != NULL)
-               free(request->url);
        request->url = xmalloc(strlen(remote->url) + 
                               strlen(request->lock->token) + 51);
        strcpy(request->url, remote->url);
@@ -281,6 +279,7 @@ static void start_put(struct transfer_request *request)
        } else {
                request->state = ABORTED;
                free(request->url);
+               request->url = NULL;
        }
 }
 
@@ -306,6 +305,7 @@ static void start_move(struct transfer_request *request)
        } else {
                request->state = ABORTED;
                free(request->url);
+               request->url = NULL;
        }
 }
 
@@ -370,6 +370,13 @@ static void finish_request(struct transfer_request *request)
 
        if (request->headers != NULL)
                curl_slist_free_all(request->headers);
+
+       /* URL is reused for MOVE after PUT */
+       if (request->state != RUN_PUT) {
+               free(request->url);
+               request->url = NULL;
+       }               
+
        if (request->state == RUN_HEAD) {
                if (request->http_code == 404) {
                        request->state = NEED_PUSH;
@@ -435,7 +442,8 @@ static void release_request(struct transfer_request *request)
                        entry->next = entry->next->next;
        }
 
-       free(request->url);
+       if (request->url != NULL)
+               free(request->url);
        free(request);
 }
 
@@ -575,6 +583,7 @@ static int fetch_index(unsigned char *sha1)
                }
        } else {
                free(url);
+               fclose(indexfile);
                return error("Unable to start request");
        }
 
@@ -1415,10 +1424,3 @@ int main(int argc, char **argv)
 
        return rc;
 }
-#else /* ifdef USE_CURL_MULTI */
-int main(int argc, char **argv)
-{
-       fprintf(stderr, "http-push requires curl 7.9.8 or higher.\n");
-       return 1;
-}
-#endif