summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2008-02-27 21:35:50 +0100
committerJunio C Hamano <gitster@pobox.com>2008-02-27 15:37:57 -0800
commit9fc6440d783ca773353880aa97c23ed9c640d3c0 (patch)
tree44f9a25443a6f1a359bc4928934591dec6e5f047 /http.h
parent81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff)
downloadgit-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.h')
-rw-r--r--http.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/http.h b/http.h
index 9bab2c8821..04169d5f9c 100644
--- a/http.h
+++ b/http.h
@@ -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;