summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorMark Lodato <lodatom@gmail.com>2009-06-15 02:39:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-18 17:10:30 (GMT)
commitef52aafa0f8b1d34f2ecd9b58f2198711c87cab3 (patch)
tree5f9fe7afde9d8c0da2a9eb781940ac09d8b9c112 /http.c
parent6fb37f86bce7cf19b4dbff2aa8a93df5ac5c4cbe (diff)
downloadgit-ef52aafa0f8b1d34f2ecd9b58f2198711c87cab3.zip
git-ef52aafa0f8b1d34f2ecd9b58f2198711c87cab3.tar.gz
git-ef52aafa0f8b1d34f2ecd9b58f2198711c87cab3.tar.bz2
http.c: fix compiling with libcurl 7.9.2
Change the minimimum required libcurl version for the http.sslKey option to 7.9.3. Previously, preprocessor macros checked for >= 7.9.2, which is incorrect because CURLOPT_SSLKEY was introduced in 7.9.3. This now allows git to compile with libcurl 7.9.2. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/http.c b/http.c
index 2e3d649..b5323a6 100644
--- a/http.c
+++ b/http.c
@@ -14,7 +14,7 @@ char curl_errorstr[CURL_ERROR_SIZE];
static int curl_ssl_verify = -1;
static const char *ssl_cert;
-#if LIBCURL_VERSION_NUM >= 0x070902
+#if LIBCURL_VERSION_NUM >= 0x070903
static const char *ssl_key;
#endif
#if LIBCURL_VERSION_NUM >= 0x070908
@@ -119,7 +119,7 @@ static int http_options(const char *var, const char *value, void *cb)
}
if (!strcmp("http.sslcert", var))
return git_config_string(&ssl_cert, var, value);
-#if LIBCURL_VERSION_NUM >= 0x070902
+#if LIBCURL_VERSION_NUM >= 0x070903
if (!strcmp("http.sslkey", var))
return git_config_string(&ssl_key, var, value);
#endif
@@ -189,7 +189,7 @@ static CURL *get_curl_handle(void)
if (ssl_cert != NULL)
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
-#if LIBCURL_VERSION_NUM >= 0x070902
+#if LIBCURL_VERSION_NUM >= 0x070903
if (ssl_key != NULL)
curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
#endif
@@ -303,7 +303,7 @@ void http_init(struct remote *remote)
curl_ssl_verify = 0;
set_from_env(&ssl_cert, "GIT_SSL_CERT");
-#if LIBCURL_VERSION_NUM >= 0x070902
+#if LIBCURL_VERSION_NUM >= 0x070903
set_from_env(&ssl_key, "GIT_SSL_KEY");
#endif
#if LIBCURL_VERSION_NUM >= 0x070908