Skip to content

Commit

Permalink
http.c: use 'git_config_string' to get 'curl_http_proxy'
Browse files Browse the repository at this point in the history
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Miklos Vajna authored and Junio C Hamano committed Dec 7, 2008
1 parent d551bba commit e4a80ec
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions http.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static const char *ssl_cainfo = NULL;
static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv = 0;
static char *curl_http_proxy = NULL;
static const char *curl_http_proxy = NULL;

static struct curl_slist *pragma_header;

Expand Down Expand Up @@ -149,11 +149,8 @@ static int http_options(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp("http.proxy", var)) {
if (curl_http_proxy == NULL) {
if (!value)
return config_error_nonbool(var);
curl_http_proxy = xstrdup(value);
}
if (curl_http_proxy == NULL)
return git_config_string(&curl_http_proxy, var, value);
return 0;
}

Expand Down Expand Up @@ -309,7 +306,7 @@ void http_cleanup(void)
pragma_header = NULL;

if (curl_http_proxy) {
free(curl_http_proxy);
free((void *)curl_http_proxy);
curl_http_proxy = NULL;
}
}
Expand Down

0 comments on commit e4a80ec

Please sign in to comment.