global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-07 00:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'http-msys-paths' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2014-05-10 16:57:01 -05:00
parent b7593f867f 57c8e5cd88
commit 7abda7a425
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
http.c
View File

@@ -7,6 +7,7 @@
#include "credential.h"
#include "version.h"
#include "pkt-line.h"
#include "exec_cmd.h"
int active_requests;
int http_is_verbose;
@@ -143,6 +144,18 @@ static void process_curl_messages(void)
}
#endif
static int git_config_path(const char **result,
const char *var, const char *value)
{
if (git_config_string(result, var, value))
return 1;
#ifdef __MINGW32__
if (**result == '/')
*result = system_path((*result) + 1);
#endif
return 0;
}
static int http_options(const char *var, const char *value, void *cb)
{
if (!strcmp("http.sslverify", var)) {
@@ -150,17 +163,17 @@ static int http_options(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp("http.sslcert", var))
return git_config_string(&ssl_cert, var, value);
return git_config_path(&ssl_cert, var, value);
#if LIBCURL_VERSION_NUM >= 0x070903
if (!strcmp("http.sslkey", var))
return git_config_string(&ssl_key, var, value);
return git_config_path(&ssl_key, var, value);
#endif
#if LIBCURL_VERSION_NUM >= 0x070908
if (!strcmp("http.sslcapath", var))
return git_config_string(&ssl_capath, var, value);
return git_config_path(&ssl_capath, var, value);
#endif
if (!strcmp("http.sslcainfo", var))
return git_config_string(&ssl_cainfo, var, value);
return git_config_path(&ssl_cainfo, var, value);
if (!strcmp("http.sslcertpasswordprotected", var)) {
ssl_cert_password_required = git_config_bool(var, value);
return 0;