undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http.c: Use 'git_config_string' to clean up SSL config.

Browse Source 
Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brian Hetro 2008-07-05 01:24:44 -04:00 committed by Junio C Hamano
parent daec808cc6
commit 7ef8ea7035
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
http.c
View File

@ -13,14 +13,14 @@ static CURL *curl_default;
char curl_errorstr[CURL_ERROR_SIZE]; char curl_errorstr[CURL_ERROR_SIZE];
static int curl_ssl_verify = -1; static int curl_ssl_verify = -1;
static char *ssl_cert = NULL; static const char *ssl_cert = NULL;
#if LIBCURL_VERSION_NUM >= 0x070902 #if LIBCURL_VERSION_NUM >= 0x070902
static char *ssl_key = NULL; static const char *ssl_key = NULL;
#endif #endif
#if LIBCURL_VERSION_NUM >= 0x070908 #if LIBCURL_VERSION_NUM >= 0x070908
static char *ssl_capath = NULL; static const char *ssl_capath = NULL;
#endif #endif
static char *ssl_cainfo = NULL; static const char *ssl_cainfo = NULL;
static long curl_low_speed_limit = -1; static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1; static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv = 0; static int curl_ftp_no_epsv = 0;
@ -101,39 +101,27 @@ static int http_options(const char *var, const char *value, void *cb)
} }
if (!strcmp("http.sslcert", var)) { if (!strcmp("http.sslcert", var)) {
if (ssl_cert == NULL) { if (ssl_cert == NULL)
if (!value) return git_config_string(&ssl_cert, var, value);
return config_error_nonbool(var);
ssl_cert = xstrdup(value);
}
return 0; return 0;
} }
#if LIBCURL_VERSION_NUM >= 0x070902 #if LIBCURL_VERSION_NUM >= 0x070902
if (!strcmp("http.sslkey", var)) { if (!strcmp("http.sslkey", var)) {
if (ssl_key == NULL) { if (ssl_key == NULL)
if (!value) return git_config_string(&ssl_key, var, value);
return config_error_nonbool(var);
ssl_key = xstrdup(value);
}
return 0; return 0;
} }
#endif #endif
#if LIBCURL_VERSION_NUM >= 0x070908 #if LIBCURL_VERSION_NUM >= 0x070908
if (!strcmp("http.sslcapath", var)) { if (!strcmp("http.sslcapath", var)) {
if (ssl_capath == NULL) { if (ssl_capath == NULL)
if (!value) return git_config_string(&ssl_capath, var, value);
return config_error_nonbool(var);
ssl_capath = xstrdup(value);
}
return 0; return 0;
} }
#endif #endif
if (!strcmp("http.sslcainfo", var)) { if (!strcmp("http.sslcainfo", var)) {
if (ssl_cainfo == NULL) { if (ssl_cainfo == NULL)
if (!value) return git_config_string(&ssl_cainfo, var, value);
return config_error_nonbool(var);
ssl_cainfo = xstrdup(value);
}
return 0; return 0;
} }