Commit 52478d7dc323ad1768bc5c6fc03c031b7adc5d20

Edward Thomson 2018-11-18T19:54:49

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.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/src/transports/http.c b/src/transports/http.c
index 4b552ac..611ec16 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(