diff options
| -rw-r--r-- | builtin-http-fetch.c | 2 | ||||
| -rw-r--r-- | http-push.c | 2 | ||||
| -rw-r--r-- | http-walker.c | 4 | ||||
| -rw-r--r-- | http.c | 10 | ||||
| -rw-r--r-- | http.h | 3 | ||||
| -rw-r--r-- | transport.c | 9 | ||||
| -rw-r--r-- | walker.h | 4 |
7 files changed, 22 insertions, 12 deletions
diff --git a/builtin-http-fetch.c b/builtin-http-fetch.c index 299093f..b1f3389 100644 --- a/builtin-http-fetch.c +++ b/builtin-http-fetch.c @@ -59,7 +59,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix) url = rewritten_url; } - walker = get_http_walker(url); + walker = get_http_walker(url, NULL); walker->get_tree = get_tree; walker->get_history = get_history; walker->get_all = get_all; diff --git a/http-push.c b/http-push.c index 5bc7736..5b23038 100644 --- a/http-push.c +++ b/http-push.c @@ -2237,7 +2237,7 @@ int main(int argc, char **argv) memset(remote_dir_exists, -1, 256); - http_init(); + http_init(NULL); no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:"); diff --git a/http-walker.c b/http-walker.c index 2c37868..7bda34d 100644 --- a/http-walker.c +++ b/http-walker.c @@ -902,13 +902,13 @@ static void cleanup(struct walker *walker) curl_slist_free_all(data->no_pragma_header); } -struct walker *get_http_walker(const char *url) +struct walker *get_http_walker(const char *url, struct remote *remote) { char *s; struct walker_data *data = xmalloc(sizeof(struct walker_data)); struct walker *walker = xmalloc(sizeof(struct walker)); - http_init(); + http_init(remote); data->no_pragma_header = curl_slist_append(NULL, "Pragma:"); @@ -218,13 +218,16 @@ static CURL* get_curl_handle(void) return result; } -void http_init(void) +void http_init(struct remote *remote) { char *low_speed_limit; char *low_speed_time; curl_global_init(CURL_GLOBAL_ALL); + if (remote && remote->http_proxy) + curl_http_proxy = xstrdup(remote->http_proxy); + pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache"); #ifdef USE_CURL_MULTI @@ -314,6 +317,11 @@ void http_cleanup(void) curl_slist_free_all(pragma_header); pragma_header = NULL; + + if (curl_http_proxy) { + free(curl_http_proxy); + curl_http_proxy = NULL; + } } struct active_request_slot *get_active_slot(void) @@ -7,6 +7,7 @@ #include <curl/easy.h> #include "strbuf.h" +#include "remote.h" /* * We detect based on the cURL version if multi-transfer is @@ -83,7 +84,7 @@ extern void add_fill_function(void *data, int (*fill)(void *)); extern void step_active_slots(void); #endif -extern void http_init(void); +extern void http_init(struct remote *remote); extern void http_cleanup(void); extern int data_received; diff --git a/transport.c b/transport.c index 0a5cf0a..166c1d1 100644 --- a/transport.c +++ b/transport.c @@ -442,7 +442,8 @@ static struct ref *get_refs_via_curl(struct transport *transport) struct ref *last_ref = NULL; if (!transport->data) - transport->data = get_http_walker(transport->url); + transport->data = get_http_walker(transport->url, + transport->remote); refs_url = xmalloc(strlen(transport->url) + 11); sprintf(refs_url, "%s/info/refs", transport->url); @@ -453,9 +454,6 @@ static struct ref *get_refs_via_curl(struct transport *transport) curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); curl_easy_setopt(slot->curl, CURLOPT_URL, refs_url); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); - if (transport->remote->http_proxy) - curl_easy_setopt(slot->curl, CURLOPT_PROXY, - transport->remote->http_proxy); if (start_active_slot(slot)) { run_active_slot(slot); @@ -509,7 +507,8 @@ static int fetch_objs_via_curl(struct transport *transport, int nr_objs, struct ref **to_fetch) { if (!transport->data) - transport->data = get_http_walker(transport->url); + transport->data = get_http_walker(transport->url, + transport->remote); return fetch_objs_via_walker(transport, nr_objs, to_fetch); } @@ -1,6 +1,8 @@ #ifndef WALKER_H #define WALKER_H +#include "remote.h" + struct walker { void *data; int (*fetch_ref)(struct walker *, char *ref, unsigned char *sha1); @@ -32,6 +34,6 @@ int walker_fetch(struct walker *impl, int targets, char **target, void walker_free(struct walker *walker); -struct walker *get_http_walker(const char *url); +struct walker *get_http_walker(const char *url, struct remote *remote); #endif /* WALKER_H */ |