From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 11 Dec 2009 11:45:04 +0000 (+0100)
Subject: fix the backport of the https methods as they would require an ABI break
X-Git-Tag: 0.7.25~4^2~5
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e4c2981b6ecb3c506d8470d4ce39fb8af29339c7?ds=inline;hp=-c

fix the backport of the https methods as they would require an ABI break
otherwise in the Configuration class.
---

e4c2981b6ecb3c506d8470d4ce39fb8af29339c7
diff --git a/methods/https.cc b/methods/https.cc
index ed1f18150..ad21ef0d3 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -62,10 +62,10 @@ void HttpsMethod::SetupProxy() {					/*{{{*/
 
 	// 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));
+				_config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
 
 	if (UseProxy.empty() == true)
-		UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy"));
+		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")
@@ -202,7 +202,7 @@ 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")")));
+			"Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
 
    // set timeout
    int timeout = _config->FindI("Acquire::https::Timeout",