diff options
author | Mike Hommey <mh@glandium.org> | 2008-02-27 21:35:50 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 15:37:57 -0800 |
commit | 9fc6440d783ca773353880aa97c23ed9c640d3c0 (patch) | |
tree | 44f9a25443a6f1a359bc4928934591dec6e5f047 /http-walker.c | |
parent | 81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff) | |
download | git-9fc6440d783ca773353880aa97c23ed9c640d3c0.tar.gz |
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 <mh@glandium.org>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-walker.c')
-rw-r--r-- | http-walker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/http-walker.c b/http-walker.c index 2c3786870e..7bda34d914 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:"); |