allow uncompressed files to be empty in store again

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index d2ddf6fcfdb204d3ede13915eae10d52223b9de3..ac6d355edae701e5c3f570fbd839d377b1af74bb 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -49,10 +49,10 @@ size_t
 HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 {
    size_t len = size * nmemb;
 HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 {
    size_t len = size * nmemb;

-   CURLUserPointer *me = (CURLUserPointer *)userp;
+   CURLUserPointer *me = static_cast<CURLUserPointer *>(userp);

    std::string line((char*) buffer, len);
    for (--len; len > 0; --len)
    std::string line((char*) buffer, len);
    for (--len; len > 0; --len)

-      if (isspace(line[len]) == 0)
+      if (isspace_ascii(line[len]) == 0)

       {
         ++len;
         break;
       {
         ++len;
         break;


@@ -115,7 +115,7 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 size_t 
 HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 {
 size_t 
 HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 {

-   HttpsMethod *me = (HttpsMethod *)userp;
+   HttpsMethod *me = static_cast<HttpsMethod *>(userp);

    size_t buffer_size = size * nmemb;
    // we don't need to count the junk here, just drop anything we get as
    // we don't always know how long it would be, e.g. in chunked encoding.
    size_t buffer_size = size * nmemb;
    // we don't need to count the junk here, just drop anything we get as
    // we don't always know how long it would be, e.g. in chunked encoding.


@@ -419,16 +419,31 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_slist_free_all(headers);
 
    // cleanup
    curl_slist_free_all(headers);
 
    // cleanup

-   if (success != 0)
+   if (success != CURLE_OK)

    {
    {

-      _error->Error("%s", curl_errorstr);
-      return false;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
+      switch (success)
+      {
+        case CURLE_COULDNT_RESOLVE_PROXY:
+        case CURLE_COULDNT_RESOLVE_HOST:
+           SetFailReason("ResolveFailure");
+           break;
+        case CURLE_COULDNT_CONNECT:
+           SetFailReason("ConnectionRefused");
+           break;
+        case CURLE_OPERATION_TIMEDOUT:
+           SetFailReason("Timeout");
+           break;
+      }
+#pragma GCC diagnostic pop
+      return _error->Error("%s", curl_errorstr);

    }
 
    // server says file not modified
    if (Server->Result == 304 || curl_condition_unmet == 1)
    {
    }
 
    // server says file not modified
    if (Server->Result == 304 || curl_condition_unmet == 1)
    {

-      unlink(File->Name().c_str());
+      RemoveFile("https", File->Name());

       Res.IMSHit = true;
       Res.LastModified = Itm->LastModified;
       Res.Size = 0;
       Res.IMSHit = true;
       Res.LastModified = Itm->LastModified;
       Res.Size = 0;


@@ -446,14 +461,14 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       SetFailReason(err);
       _error->Error("%i %s", Server->Result, Server->Code);
       // unlink, no need keep 401/404 page content in partial/
       SetFailReason(err);
       _error->Error("%i %s", Server->Result, Server->Code);
       // unlink, no need keep 401/404 page content in partial/

-      unlink(File->Name().c_str());
+      RemoveFile("https", File->Name());

       return false;
    }
 
    // invalid range-request
    if (Server->Result == 416)
    {
       return false;
    }
 
    // invalid range-request
    if (Server->Result == 416)
    {

-      unlink(File->Name().c_str());
+      RemoveFile("https", File->Name());

       delete File;
       Redirect(Itm->Uri);
       return true;
       delete File;
       Redirect(Itm->Uri);
       return true;


@@ -505,9 +520,9 @@ bool HttpsMethod::Configuration(string Message)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-ServerState * HttpsMethod::CreateServerState(URI uri)                  /*{{{*/
+std::unique_ptr<ServerState> HttpsMethod::CreateServerState(URI const &uri)/*{{{*/

 {
 {

-   return new HttpsServerState(uri, this);
+   return std::unique_ptr<ServerState>(new HttpsServerState(uri, this));

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/