make http size check work

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index febe6a0f0ed77b19754f1d848b93603ffc02952d..eec858417af0262c8496ea665f901274301515d1 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -18,19 +18,21 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/macros.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/proxy.h>

 
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>

-#include <signal.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <errno.h>
-#include <string.h>

 #include <iostream>
 #include <sstream>
 #include <iostream>
 #include <sstream>

+#include <ctype.h>
+#include <stdlib.h>

 
 

-#include "config.h"

 #include "https.h"
 #include "https.h"

+

 #include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;
 #include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;


@@ -80,12 +82,18 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    if(me->File->Write(buffer, size*nmemb) != true)
       return false;
 
    if(me->File->Write(buffer, size*nmemb) != true)
       return false;
 

+   me->TotalWritten += size*nmemb;
+   if(me->TotalWritten > me->Queue->ExpectedSize)
+      return _error->Error("Writing more data than expected (%llu > %llu)",
+                           me->TotalWritten, me->Queue->ExpectedSize);
+
+

    return size*nmemb;
 }
 
    return size*nmemb;
 }
 

-int 
-HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, 
-                             double ultotal, double ulnow)
+int
+HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
+                             double /*ultotal*/, double /*ulnow*/)

 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {
 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {


@@ -95,7 +103,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
 }
 
 // HttpsServerState::HttpsServerState - Constructor                    /*{{{*/
 }
 
 // HttpsServerState::HttpsServerState - Constructor                    /*{{{*/

-HttpsServerState::HttpsServerState(URI Srv,HttpsMethod *Owner) : ServerState(Srv, NULL)
+HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)

 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
    Reset();
 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
    Reset();


@@ -106,6 +114,9 @@ void HttpsMethod::SetupProxy()                                      /*{{{*/
 {
    URI ServerName = Queue->Uri;
 
 {
    URI ServerName = Queue->Uri;
 

+   // Determine the proxy setting
+   AutoDetectProxy(ServerName);
+

    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a
    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a


@@ -324,11 +335,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
    // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {

-      char Buf[1000];
-      sprintf(Buf, "Range: bytes=%li-", (long) SBuf.st_size);
-      headers = curl_slist_append(headers, Buf);
-      sprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
-      headers = curl_slist_append(headers, Buf);
+      std::string Buf;
+      strprintf(Buf, "Range: bytes=%lli-", (long long) SBuf.st_size);
+      headers = curl_slist_append(headers, Buf.c_str());
+      strprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
+      headers = curl_slist_append(headers, Buf.c_str());

    }
    else if(Itm->LastModified > 0)
    {
    }
    else if(Itm->LastModified > 0)
    {


@@ -432,7 +443,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    delete File;
 
    return true;
    delete File;
 
    return true;

-};
+}

 
 int main()
 {
 
 int main()
 {


@@ -441,6 +452,8 @@ int main()
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 

+   Mth.DropPrivsOrDie();
+

    return Mth.Run();
 }
 
    return Mth.Run();
 }