[PATCH] Set proxy override with http_init()
- From
Mike Hommey <mh@glandium.org>
- Date
- Feb 27, 2008, 07:36 UTC
- Message-ID
- <1204097780-29581-1-git-send-email-mh@glandium.org>
- In-Reply-To
- <20080227072012.GA23423@glandium.org>
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 proxy url as argument.
At the same time, we make get_http_walker() take a proxy argument too, and pass it to http_init(), which makes remote defined proxy be used for more than get_refs_via_curl().
Signed-off-by: Mike Hommey <mh@glandium.org> --- > Note that remote.<name>.proxy config doesn't work as expected, you > should use http.proxy which just work (and the change in transport.c is > useless, then). I have, as part of by http-refactoring topic, a patch > for remote.<name>.proxy to work better, though it doesn't support > changing the proxy authentication method. And here is said patch.
http-push.c | 2 +- http-walker.c | 4 ++-- http.c | 10 +++++++++- http.h | 2 +- transport.c | 9 ++++----- walker.h | 2 +- 6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/http-push.c b/http-push.c index 0beb740..04e056d 100644 --- a/http-push.c +++ b/http-push.c @@ -2240,7 +2240,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:"); diff --git a/http-walker.c b/http-walker.c index 2c37868..02be6c8 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, const char *proxy) { char *s; struct walker_data *data = xmalloc(sizeof(struct walker_data)); struct walker *walker = xmalloc(sizeof(struct walker)); - http_init(); + http_init(proxy); data->no_pragma_header = curl_slist_append(NULL, "Pragma:"); diff --git a/http.c b/http.c index 519621a..89194d7 100644 --- a/http.c +++ b/http.c @@ -219,13 +219,16 @@ static CURL* get_curl_handle(void) return result; } -void http_init(void) +void http_init(const char *proxy) { char *low_speed_limit; char *low_speed_time; curl_global_init(CURL_GLOBAL_ALL); + if (proxy) + curl_http_proxy = xstrdup(proxy); + pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache"); #ifdef USE_CURL_MULTI @@ -315,6 +318,11 @@ void http_cleanup(void) curl_slist_free_all(pragma_header); pragma_header = NULL; + + if (curl_http_proxy) { + free(curl_http_proxy); + curl_http_proxy = NULL; + } } struct active_request_slot *get_active_slot(void) diff --git a/http.h b/http.h index 9bab2c8..dcd5cea 100644 --- a/http.h +++ b/http.h @@ -83,7 +83,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(const char *proxy); extern void http_cleanup(void); extern int data_received; diff --git a/transport.c b/transport.c index 397983d..26f0f02 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->http_proxy); 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->http_proxy); return fetch_objs_via_walker(transport, nr_objs, to_fetch); } diff --git a/walker.h b/walker.h index ea2c363..2cc448a 100644 --- a/walker.h +++ b/walker.h @@ -32,6 +32,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, const char *proxy); #endif /* WALKER_H */
-- 1.5.4.1.48.g0d77