summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-11-18 19:54:49 +0000
committerEdward Thomson <ethomson@edwardthomson.com>2018-11-28 15:46:58 +0000
commit52478d7dc323ad1768bc5c6fc03c031b7adc5d20 (patch)
treeb835212656aa497dd5ef3d5bec326b0d8e136f4a
parent41f620d9a1fd701efb6b9910c364d1eac4d47355 (diff)
downloadlibgit2-52478d7dc323ad1768bc5c6fc03c031b7adc5d20.tar.gz
http: don't allow SSL connections to a proxy
Temporarily disallow SSL connections to a proxy until we can understand the valgrind warnings when tunneling OpenSSL over OpenSSL.
-rw-r--r--src/transports/http.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/transports/http.c b/src/transports/http.c
index 4b552acf7..611ec163f 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -695,7 +695,15 @@ static int load_proxy_config(http_subtransport *t)
return -1;
}
- return gitno_connection_data_from_url(&t->proxy.url, t->proxy_opts.url, NULL);
+ if ((error = gitno_connection_data_from_url(&t->proxy.url, t->proxy_opts.url, NULL)) < 0)
+ return error;
+
+ if (t->proxy.url.use_ssl) {
+ giterr_set(GITERR_NET, "SSL connections to proxy are not supported");
+ return -1;
+ }
+
+ return error;
}
static int check_certificate(