Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
http: fix an unused variable warning for 'curl_no_proxy'
author
Ramsay Jones
<ramsay@ramsayjones.plus.com>
Wed, 14 Mar 2018 21:56:06 +0000
(21:56 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Mar 2018 20:11:52 +0000
(13:11 -0700)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
http.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
38e79b1
)
diff --git
a/http.c
b/http.c
index 5977712712b22d9076d8cd5ccda0fe12b3057d27..b930c0e628594eb6724ffeeae05fc705372fba0b 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-66,6
+66,9
@@
static const char *ssl_key;
#if LIBCURL_VERSION_NUM >= 0x070908
static const char *ssl_capath;
#endif
#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
#if LIBCURL_VERSION_NUM >= 0x072c00
static const char *ssl_pinnedkey;
#endif
@@
-74,7
+77,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 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;
static const char *http_proxy_authmethod;
static struct {
const char *name;