rename the newly public CheckDirectory method to CreateAPTDirectoryIfNeeded

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index 35c23db20dfc6d332c622c9168eeab5c3a02da15..aa6786aa86fa9ad92f82ebbdccbfa9495485422c 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -133,7 +133,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    string cainfo = _config->Find("Acquire::https::CaInfo","");
    string knob = "Acquire::https::"+remotehost+"::CaInfo";
    cainfo = _config->Find(knob.c_str(),cainfo.c_str());
    string cainfo = _config->Find("Acquire::https::CaInfo","");
    string knob = "Acquire::https::"+remotehost+"::CaInfo";
    cainfo = _config->Find(knob.c_str(),cainfo.c_str());

-   if(cainfo != "")
+   if(cainfo.empty() == false)

       curl_easy_setopt(curl, CURLOPT_CAINFO,cainfo.c_str());
 
    // Check server certificate against previous CA list ...
       curl_easy_setopt(curl, CURLOPT_CAINFO,cainfo.c_str());
 
    // Check server certificate against previous CA list ...


@@ -155,21 +155,21 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    string issuercert = _config->Find("Acquire::https::IssuerCert","");
    knob = "Acquire::https::"+remotehost+"::IssuerCert";
    issuercert = _config->Find(knob.c_str(),issuercert.c_str());
    string issuercert = _config->Find("Acquire::https::IssuerCert","");
    knob = "Acquire::https::"+remotehost+"::IssuerCert";
    issuercert = _config->Find(knob.c_str(),issuercert.c_str());

-   if(issuercert != "")
+   if(issuercert.empty() == false)

       curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str());
 
    // For client authentication, certificate file ...
    string pem = _config->Find("Acquire::https::SslCert","");
    knob = "Acquire::https::"+remotehost+"::SslCert";
    pem = _config->Find(knob.c_str(),pem.c_str());
       curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str());
 
    // For client authentication, certificate file ...
    string pem = _config->Find("Acquire::https::SslCert","");
    knob = "Acquire::https::"+remotehost+"::SslCert";
    pem = _config->Find(knob.c_str(),pem.c_str());

-   if(pem != "")
+   if(pem.empty() == false)

       curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
 
    // ... and associated key.
    string key = _config->Find("Acquire::https::SslKey","");
    knob = "Acquire::https::"+remotehost+"::SslKey";
    key = _config->Find(knob.c_str(),key.c_str());
       curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
 
    // ... and associated key.
    string key = _config->Find("Acquire::https::SslKey","");
    knob = "Acquire::https::"+remotehost+"::SslKey";
    key = _config->Find(knob.c_str(),key.c_str());

-   if(key != "")
+   if(key.empty() == false)

       curl_easy_setopt(curl, CURLOPT_SSLKEY, key.c_str());
 
    // Allow forcing SSL version to SSLv3 or TLSv1 (SSLv2 is not
       curl_easy_setopt(curl, CURLOPT_SSLKEY, key.c_str());
 
    // Allow forcing SSL version to SSLv3 or TLSv1 (SSLv2 is not


@@ -188,7 +188,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    string crlfile = _config->Find("Acquire::https::CrlFile","");
    knob = "Acquire::https::"+remotehost+"::CrlFile";
    crlfile = _config->Find(knob.c_str(),crlfile.c_str());
    string crlfile = _config->Find("Acquire::https::CrlFile","");
    knob = "Acquire::https::"+remotehost+"::CrlFile";
    crlfile = _config->Find(knob.c_str(),crlfile.c_str());

-   if(crlfile != "")
+   if(crlfile.empty() == false)

       curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str());
 
    // cache-control
       curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str());
 
    // cache-control


@@ -210,7 +210,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 
    // speed limit
    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 
    // speed limit

-   int dlLimit = _config->FindI("Acquire::https::Dl-Limit",
+   int const dlLimit = _config->FindI("Acquire::https::Dl-Limit",

                _config->FindI("Acquire::http::Dl-Limit",0))*1024;
    if (dlLimit > 0)
       curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
                _config->FindI("Acquire::http::Dl-Limit",0))*1024;
    if (dlLimit > 0)
       curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);


@@ -222,7 +222,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
                        "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
 
    // set timeout
                        "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
 
    // set timeout

-   int timeout = _config->FindI("Acquire::https::Timeout",
+   int const timeout = _config->FindI("Acquire::https::Timeout",

                _config->FindI("Acquire::http::Timeout",120));
    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
    //set really low lowspeed timeout (see #497983)
                _config->FindI("Acquire::http::Timeout",120));
    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
    //set really low lowspeed timeout (see #497983)


@@ -230,7 +230,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
 
    // set redirect options and default to 10 redirects
    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
 
    // set redirect options and default to 10 redirects

-   bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
+   bool const AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",

        _config->FindB("Acquire::http::AllowRedirect",true));
    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
    curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);
        _config->FindB("Acquire::http::AllowRedirect",true));
    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
    curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);