aboutsummaryrefslogtreecommitdiff
path: root/http-push.c
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-push.c
parent81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff)
downloadgit-9fc6440d783ca773353880aa97c23ed9c640d3c0.tar.gz
git-9fc6440d783ca773353880aa97c23ed9c640d3c0.tar.xz
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-push.c')
-rw-r--r--http-push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c
index b2b410df9..869c01c75 100644
--- a/http-push.c
+++ b/http-push.c
@@ -2233,7 +2233,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:");