summaryrefslogtreecommitdiff
path: root/http-fetch.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@smyrno.hos.anvin.org>2005-09-30 10:44:21 -0700
committerH. Peter Anvin <hpa@smyrno.hos.anvin.org>2005-09-30 10:44:21 -0700
commit300b4801b75a59961e66ad9fa96941e46fd76be5 (patch)
treef22490c08acc9314f493559e3339b72b18b57098 /http-fetch.c
parent09dea56568f90952b87d29353aca53359157cd29 (diff)
parent894a8a8b1b935639ac2ea503e8fa2887fd6bd44b (diff)
downloadgit-300b4801b75a59961e66ad9fa96941e46fd76be5.tar.gz
Merge with master.kernel.org:/pub/scm/git/git.git
Diffstat (limited to 'http-fetch.c')
-rw-r--r--http-fetch.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http-fetch.c b/http-fetch.c
index 33f3949252..0566a9125c 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -529,9 +529,11 @@ int main(int argc, char **argv)
if ((ssl_cert = getenv("GIT_SSL_CERT")) != NULL) {
curl_easy_setopt(curl, CURLOPT_SSLCERT, ssl_cert);
}
+#if LIBCURL_VERSION_NUM >= 0x070902
if ((ssl_key = getenv("GIT_SSL_KEY")) != NULL) {
curl_easy_setopt(curl, CURLOPT_SSLKEY, ssl_key);
}
+#endif
#if LIBCURL_VERSION_NUM >= 0x070908
if ((ssl_capath = getenv("GIT_SSL_CAPATH")) != NULL) {
curl_easy_setopt(curl, CURLOPT_CAPATH, ssl_capath);