Browse Source

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>
maint
Mike Hommey 17 years ago committed by Junio C Hamano
parent
commit
9fc6440d78
  1. 2
      builtin-http-fetch.c
  2. 2
      http-push.c
  3. 4
      http-walker.c
  4. 10
      http.c
  5. 3
      http.h
  6. 9
      transport.c
  7. 4
      walker.h

2
builtin-http-fetch.c

@ -59,7 +59,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix) @@ -59,7 +59,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
url = rewritten_url;
}

walker = get_http_walker(url);
walker = get_http_walker(url, NULL);
walker->get_tree = get_tree;
walker->get_history = get_history;
walker->get_all = get_all;

2
http-push.c

@ -2233,7 +2233,7 @@ int main(int argc, char **argv) @@ -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:");


4
http-walker.c

@ -902,13 +902,13 @@ static void cleanup(struct walker *walker) @@ -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:");


10
http.c

@ -218,13 +218,16 @@ static CURL* get_curl_handle(void) @@ -218,13 +218,16 @@ static CURL* get_curl_handle(void)
return result;
}

void http_init(void)
void http_init(struct remote *remote)
{
char *low_speed_limit;
char *low_speed_time;

curl_global_init(CURL_GLOBAL_ALL);

if (remote && remote->http_proxy)
curl_http_proxy = xstrdup(remote->http_proxy);

pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");

#ifdef USE_CURL_MULTI
@ -314,6 +317,11 @@ void http_cleanup(void) @@ -314,6 +317,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)

3
http.h

@ -7,6 +7,7 @@ @@ -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 *)); @@ -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;

9
transport.c

@ -442,7 +442,8 @@ static struct ref *get_refs_via_curl(struct transport *transport) @@ -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) @@ -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, @@ -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);
}


4
walker.h

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
#ifndef WALKER_H
#define WALKER_H

#include "remote.h"

struct walker {
void *data;
int (*fetch_ref)(struct walker *, char *ref, unsigned char *sha1);
@ -32,6 +34,6 @@ int walker_fetch(struct walker *impl, int targets, char **target, @@ -32,6 +34,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, struct remote *remote);

#endif /* WALKER_H */

Loading…
Cancel
Save