merge with lp:~mvo/apt/sid to get the finale 0.7.25 state

1 files changed, 35 insertions, 33 deletions

diff --git a/methods/https.cc b/methods/https.cc
index 726f53c44..5d8e63f47 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -57,37 +57,40 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
    return 0;
 }
 
-void HttpsMethod::SetupProxy() {					/*{{{*/
-	URI ServerName = Queue->Uri;
-
-	// Determine the proxy setting - try https first, fallback to http and use env at last
-	string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
-				_config->Find("Acquire::http::Proxy::" + ServerName.Host));
-
-	if (UseProxy.empty() == true)
-		UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy"));
-
-	// User want to use NO proxy, so nothing to setup
-	if (UseProxy == "DIRECT")
-		return;
-
-	if (UseProxy.empty() == false) {
-		// Parse no_proxy, a comma (,) separated list of domains we don't want to use
-		// a proxy for so we stop right here if it is in the list
-		if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
-			return;
-	} else {
-		const char* result = getenv("http_proxy");
-		UseProxy = result == NULL ? "" : result;
-	}
-
-	// Determine what host and port to use based on the proxy settings
-	if (UseProxy.empty() == false) {
-		Proxy = UseProxy;
-		if (Proxy.Port != 1)
-			curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
-		curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
-	}
+void HttpsMethod::SetupProxy()  					/*{{{*/
+{
+   URI ServerName = Queue->Uri;
+
+   // Determine the proxy setting - try https first, fallback to http and use env at last
+   string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
+				   _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
+
+   if (UseProxy.empty() == true)
+      UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy").c_str());
+
+   // User want to use NO proxy, so nothing to setup
+   if (UseProxy == "DIRECT")
+      return;
+
+   if (UseProxy.empty() == false) 
+   {
+      // Parse no_proxy, a comma (,) separated list of domains we don't want to use
+      // a proxy for so we stop right here if it is in the list
+      if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+	 return;
+   } else {
+      const char* result = getenv("http_proxy");
+      UseProxy = result == NULL ? "" : result;
+   }
+
+   // Determine what host and port to use based on the proxy settings
+   if (UseProxy.empty() == false) 
+   {
+      Proxy = UseProxy;
+      if (Proxy.Port != 1)
+	 curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
+      curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
+   }
 }									/*}}}*/
 // HttpsMethod::Fetch - Fetch an item					/*{{{*/
 // ---------------------------------------------------------------------
@@ -202,12 +205,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
 	_config->Find("Acquire::https::User-Agent",
 		_config->Find("Acquire::http::User-Agent",
-			"Debian APT-CURL/1.0 ("VERSION")")).c_str());
+			"Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
 
    // set timeout
    int timeout = _config->FindI("Acquire::https::Timeout",
 		_config->FindI("Acquire::http::Timeout",120));
-   curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
    //set really low lowspeed timeout (see #497983)
    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);