From 9fc6440d783ca773353880aa97c23ed9c640d3c0 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 27 Feb 2008 21:35:50 +0100 Subject: Set proxy override with http_init() In transport.c, proxy setting (the one from the remote conf) was set through curl_easy_setopt() call, while http.c already does the same with the http.proxy setting. We now just use this infrastructure instead, and make http_init() now take the struct remote as argument so that it can take the http_proxy setting from there, and any other property that would be added later. At the same time, we make get_http_walker() take a struct remote argument too, and pass it to http_init(), which makes remote defined proxy be used for more than get_refs_via_curl(). We leave out http-fetch and http-push, which don't use remotes for the moment, purposefully. Signed-off-by: Mike Hommey Acked-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- walker.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'walker.h') diff --git a/walker.h b/walker.h index ea2c363f4e..e1d40deaff 100644 --- a/walker.h +++ b/walker.h @@ -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 */ -- cgit 1.2.3-korg