From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 31 Jul 2016 16:46:34 +0000 (+0200)
Subject: support all socks-proxy known to curl in https method
X-Git-Tag: 1.3_rc1~4^2~9
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d415fc795a69d6a5039964e88f97561183d6ab44?ds=inline;hp=--cc

support all socks-proxy known to curl in https method
---

d415fc795a69d6a5039964e88f97561183d6ab44
diff --git a/methods/https.cc b/methods/https.cc
index bbdbd8fa9..50121ec4d 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -205,9 +205,20 @@ void HttpsMethod::SetupProxy()						/*{{{*/
    }
 
    // Determine what host and port to use based on the proxy settings
-   if (UseProxy.empty() == false) 
+   if (UseProxy.empty() == false)
    {
       Proxy = UseProxy;
+      if (Proxy.Access == "socks5h")
+	 curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
+      else if (Proxy.Access == "socks5")
+	 curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+      else if (Proxy.Access == "socks4a")
+	 curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4A);
+      else if (Proxy.Access == "socks")
+	 curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
+      else
+	 curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+
       if (Proxy.Port != 1)
 	 curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
       curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());