development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-02 15:48:44 +00:00
Code Issues Projects Releases Wiki Activity

http.c: use 'git_config_string' to get 'curl_http_proxy'

Browse Source 
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miklos Vajna 2008-12-07 01:45:37 +01:00 committed by Junio C Hamano
parent d551bbaf3a
commit e4a80ecf40
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
http.c
View File

@ -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;
@ -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;
}
@ -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;
}
}