diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:11:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:11:26 -0800 |
| commit | 7ab9f8f8b12853d4cb0e45031bf2ee9a0517ad22 (patch) | |
| tree | e49451e1e0e6c60c424c8c6334b9dacc6b9577f7 /transport.c | |
| parent | d82b21b57a50f7820c57a13c09232077365095c7 (diff) | |
| parent | 9fc6440d783ca773353880aa97c23ed9c640d3c0 (diff) | |
| download | git-7ab9f8f8b12853d4cb0e45031bf2ee9a0517ad22.tar.gz | |
Merge branch 'mh/maint-http-proxy-fix'
* mh/maint-http-proxy-fix:
Set proxy override with http_init()
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/transport.c b/transport.c index 0a5cf0a9c2..166c1d1d46 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); } |