mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  GIT 1.6.0.5
  "git diff <tree>{3,}": do not reverse order of arguments
  tag: delete TAG_EDITMSG only on successful tag
  gitweb: Make project specific override for 'grep' feature work
  http.c: use 'git_config_string' to get 'curl_http_proxy'
  fetch-pack: Avoid memcpy() with src==dst
This commit is contained in:
Junio C Hamano
2008-12-07 15:13:02 -08:00
parent 2dd620286e 1c2ed59de2
commit 3a59bb22db
5 changed files with 55 additions and 31 deletions
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;
}
}