]> git.saurik.com Git - apt.git/commitdiff
fix the backport of the https methods as they would require an ABI break
authorDavid Kalnischkies <kalnischkies@gmail.com>
Fri, 11 Dec 2009 11:45:04 +0000 (12:45 +0100)
committerDavid Kalnischkies <kalnischkies@gmail.com>
Fri, 11 Dec 2009 11:45:04 +0000 (12:45 +0100)
otherwise in the Configuration class.

methods/https.cc

index ed1f181509e1389fb8014bba5cd8914af98ad107..ad21ef0d3ba62313f1e24f6bc99682470f329d48 100644 (file)
@@ -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",