summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-21 18:30:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-21 18:30:12 (GMT)
commit79cc6432ec12aee9efba11e739f4b24ca959b7bb (patch)
tree4bd6e38e646a5be8482ef4070e1474e1f524284e /http.c
parent564710379b4aa8300c25502b6090e50b8ea74bf5 (diff)
parentb8fd6008ec5651925c46858499f182222174392c (diff)
downloadgit-79cc6432ec12aee9efba11e739f4b24ca959b7bb.zip
git-79cc6432ec12aee9efba11e739f4b24ca959b7bb.tar.gz
git-79cc6432ec12aee9efba11e739f4b24ca959b7bb.tar.bz2
Merge branch 'rj/http-code-cleanup'
There was an unused file-scope static variable left in http.c when building for versions of libCURL that is older than 7.19.4, which has been fixed. * rj/http-code-cleanup: http: fix an unused variable warning for 'curl_no_proxy'
Diffstat (limited to 'http.c')
-rw-r--r--http.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/http.c b/http.c
index 8c11156..a5bd5d6 100644
--- a/http.c
+++ b/http.c
@@ -69,6 +69,9 @@ static const char *ssl_key;
#if LIBCURL_VERSION_NUM >= 0x070908
static const char *ssl_capath;
#endif
+#if LIBCURL_VERSION_NUM >= 0x071304
+static const char *curl_no_proxy;
+#endif
#if LIBCURL_VERSION_NUM >= 0x072c00
static const char *ssl_pinnedkey;
#endif
@@ -77,7 +80,6 @@ static long curl_low_speed_limit = -1;
static long curl_low_speed_time = -1;
static int curl_ftp_no_epsv;
static const char *curl_http_proxy;
-static const char *curl_no_proxy;
static const char *http_proxy_authmethod;
static struct {
const char *name;