summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-12-11 12:45:04 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-12-11 12:45:04 +0100
commite4c2981b6ecb3c506d8470d4ce39fb8af29339c7 (patch)
treef545c573f11470f7da0283d880697944a246bf1f /methods
parentca4907db7c8ec2d409a9ca32aeb2ccb4c3cd40aa (diff)
fix the backport of the https methods as they would require an ABI break
otherwise in the Configuration class.
Diffstat (limited to 'methods')
-rw-r--r--methods/https.cc6
1 files changed, 3 insertions, 3 deletions
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",