merged from lp:~donkult/apt/experimental/

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 13f9cbe0613a01d4c102961efc6a15248c6343e8..b8ed43cd256cb99d07827adb0bff7dc761c553b8 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -25,8 +25,11 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>

+#include <apt-pkg/configuration.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>


@@ -41,8 +44,6 @@
 #include <string.h>
 #include <iostream>
 #include <map>
 #include <string.h>
 #include <iostream>
 #include <map>

-#include <apti18n.h>
-

 
 // Internet stuff
 #include <netdb.h>
 
 // Internet stuff
 #include <netdb.h>


@@ -51,6 +52,8 @@
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"

+
+#include <apti18n.h>

                                                                        /*}}}*/
 using namespace std;
 
                                                                        /*}}}*/
 using namespace std;
 


@@ -63,15 +66,15 @@ bool AllowRedirect = false;
 bool Debug = false;
 URI Proxy;
 
 bool Debug = false;
 URI Proxy;
 

-unsigned long CircleBuf::BwReadLimit=0;
-unsigned long CircleBuf::BwTickReadData=0;
+unsigned long long CircleBuf::BwReadLimit=0;
+unsigned long long CircleBuf::BwTickReadData=0;

 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
  
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
  
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
+CircleBuf::CircleBuf(unsigned long long Size) : Size(Size), Hash(0)

 {
    Buf = new unsigned char[Size];
    Reset();
 {
    Buf = new unsigned char[Size];
    Reset();


@@ -87,7 +90,7 @@ void CircleBuf::Reset()
    InP = 0;
    OutP = 0;
    StrPos = 0;
    InP = 0;
    OutP = 0;
    StrPos = 0;

-   MaxGet = (unsigned int)-1;
+   MaxGet = (unsigned long long)-1;

    OutQueue = string();
    if (Hash != 0)
    {
    OutQueue = string();
    if (Hash != 0)
    {


@@ -102,7 +105,7 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {

-   unsigned long BwReadMax;
+   unsigned long long BwReadMax;

 
    while (1)
    {
 
    while (1)
    {


@@ -117,7 +120,7 @@ bool CircleBuf::Read(int Fd)
         struct timeval now;
         gettimeofday(&now,0);
 
         struct timeval now;
         gettimeofday(&now,0);
 

-        unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+        unsigned long long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +

            now.tv_usec-CircleBuf::BwReadTick.tv_usec;
         if(d > 1000000/BW_HZ) {
            CircleBuf::BwReadTick = now;
            now.tv_usec-CircleBuf::BwReadTick.tv_usec;
         if(d > 1000000/BW_HZ) {
            CircleBuf::BwReadTick = now;


@@ -131,7 +134,7 @@ bool CircleBuf::Read(int Fd)
       }
 
       // Write the buffer segment
       }
 
       // Write the buffer segment

-      int Res;
+      ssize_t Res;

       if(CircleBuf::BwReadLimit) {
         Res = read(Fd,Buf + (InP%Size), 
                    BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
       if(CircleBuf::BwReadLimit) {
         Res = read(Fd,Buf + (InP%Size), 
                    BwReadMax > LeftRead() ? LeftRead() : BwReadMax);


@@ -180,7 +183,7 @@ void CircleBuf::FillOut()
         return;
       
       // Write the buffer segment
         return;
       
       // Write the buffer segment

-      unsigned long Sz = LeftRead();
+      unsigned long long Sz = LeftRead();

       if (OutQueue.length() - StrPos < Sz)
         Sz = OutQueue.length() - StrPos;
       memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);
       if (OutQueue.length() - StrPos < Sz)
         Sz = OutQueue.length() - StrPos;
       memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);


@@ -214,7 +217,7 @@ bool CircleBuf::Write(int Fd)
         return true;
       
       // Write the buffer segment
         return true;
       
       // Write the buffer segment

-      int Res;
+      ssize_t Res;

       Res = write(Fd,Buf + (OutP%Size),LeftWrite());
 
       if (Res == 0)
       Res = write(Fd,Buf + (OutP%Size),LeftWrite());
 
       if (Res == 0)


@@ -240,7 +243,7 @@ bool CircleBuf::Write(int Fd)
 bool CircleBuf::WriteTillEl(string &Data,bool Single)
 {
    // We cheat and assume it is unneeded to have more than one buffer load
 bool CircleBuf::WriteTillEl(string &Data,bool Single)
 {
    // We cheat and assume it is unneeded to have more than one buffer load

-   for (unsigned long I = OutP; I < InP; I++)
+   for (unsigned long long I = OutP; I < InP; I++)

    {      
       if (Buf[I%Size] != '\n')
         continue;
    {      
       if (Buf[I%Size] != '\n')
         continue;


@@ -258,7 +261,7 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
       Data = "";
       while (OutP < I)
       {
       Data = "";
       while (OutP < I)
       {

-        unsigned long Sz = LeftWrite();
+        unsigned long long Sz = LeftWrite();

         if (Sz == 0)
            return false;
         if (I - OutP < Sz)
         if (Sz == 0)
            return false;
         if (I - OutP < Sz)


@@ -286,6 +289,11 @@ void CircleBuf::Stats()
    clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/
 }
                                                                        /*}}}*/
    clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/
 }
                                                                        /*}}}*/

+CircleBuf::~CircleBuf()
+{
+   delete [] Buf;
+   delete Hash;
+}

 
 // ServerState::ServerState - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------
 
 // ServerState::ServerState - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------


@@ -402,10 +410,10 @@ ServerState::RunHeadersResult ServerState::RunHeaders()
       if (Debug == true)
         clog << Data;
       
       if (Debug == true)
         clog << Data;
       

-      for (string::const_iterator I = Data.begin(); I < Data.end(); I++)
+      for (string::const_iterator I = Data.begin(); I < Data.end(); ++I)

       {
         string::const_iterator J = I;
       {
         string::const_iterator J = I;

-        for (; J != Data.end() && *J != '\n' && *J != '\r';J++);
+        for (; J != Data.end() && *J != '\n' && *J != '\r'; ++J);

         if (HeaderLine(string(I,J)) == false)
            return RUN_HEADERS_PARSE_ERROR;
         I = J;
         if (HeaderLine(string(I,J)) == false)
            return RUN_HEADERS_PARSE_ERROR;
         I = J;


@@ -453,7 +461,7 @@ bool ServerState::RunData()
            return false;
                 
         // See if we are done
            return false;
                 
         // See if we are done

-        unsigned long Len = strtol(Data.c_str(),0,16);
+        unsigned long long Len = strtoull(Data.c_str(),0,16);

         if (Len == 0)
         {
            In.Limit(-1);
         if (Len == 0)
         {
            In.Limit(-1);


@@ -596,7 +604,7 @@ bool ServerState::HeaderLine(string Line)
       if (StartPos != 0)
         return true;
       
       if (StartPos != 0)
         return true;
       

-      if (sscanf(Val.c_str(),"%lu",&Size) != 1)
+      if (sscanf(Val.c_str(),"%llu",&Size) != 1)

         return _error->Error(_("The HTTP server sent an invalid Content-Length header"));
       return true;
    }
         return _error->Error(_("The HTTP server sent an invalid Content-Length header"));
       return true;
    }


@@ -611,9 +619,9 @@ bool ServerState::HeaderLine(string Line)
    {
       HaveContent = true;
       
    {
       HaveContent = true;
       

-      if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)
+      if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2)

         return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
         return _error->Error(_("The HTTP server sent an invalid Content-Range header"));

-      if ((unsigned)StartPos > Size)
+      if ((unsigned long long)StartPos > Size)

         return _error->Error(_("This HTTP server has broken range support"));
       return true;
    }
         return _error->Error(_("This HTTP server has broken range support"));
       return true;
    }


@@ -716,7 +724,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       // In this case we send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       // In this case we send an if-range query with a range header

-      sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",(long)SBuf.st_size - 1,
+      sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size - 1,

              TimeRFC1123(SBuf.st_mtime).c_str());
       Req += Buf;
    }
              TimeRFC1123(SBuf.st_mtime).c_str());
       Req += Buf;
    }


@@ -999,31 +1007,21 @@ HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
    FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
    FailFd = File->Fd();
    FailTime = Srv->Date;
    FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
    FailFd = File->Fd();
    FailTime = Srv->Date;

-      
-   // Set the expected size
-   if (Srv->StartPos >= 0)
-   {
-      Res.ResumePoint = Srv->StartPos;
-      if (ftruncate(File->Fd(),Srv->StartPos) < 0)
-        _error->Errno("ftruncate", _("Failed to truncate file"));
-   }
-      
-   // Set the start point
-   lseek(File->Fd(),0,SEEK_END);

 
    delete Srv->In.Hash;
    Srv->In.Hash = new Hashes;
 
    delete Srv->In.Hash;
    Srv->In.Hash = new Hashes;

-   
-   // Fill the Hash if the file is non-empty (resume)
-   if (Srv->StartPos > 0)
+
+   // Set the expected size and read file for the hashes
+   if (Srv->StartPos >= 0)

    {
    {

-      lseek(File->Fd(),0,SEEK_SET);
-      if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false)
+      Res.ResumePoint = Srv->StartPos;
+      File->Truncate(Srv->StartPos);
+
+      if (Srv->In.Hash->AddFD(*File,Srv->StartPos) == false)

       {
         _error->Errno("read",_("Problem hashing file"));
         return ERROR_NOT_FROM_SERVER;
       }
       {
         _error->Errno("read",_("Problem hashing file"));
         return ERROR_NOT_FROM_SERVER;
       }

-      lseek(File->Fd(),0,SEEK_END);

    }
    
    SetNonBlock(File->Fd(),true);
    }
    
    SetNonBlock(File->Fd(),true);


@@ -1325,7 +1323,7 @@ int HttpMethod::Loop()
                StopRedirects = true;
             else
             {
                StopRedirects = true;
             else
             {

-               for (StringVectorIterator I = R.begin(); I != R.end(); I++)
+               for (StringVectorIterator I = R.begin(); I != R.end(); ++I)

                   if (Queue->Uri == *I)
                   {
                      R[0] = "STOP";
                   if (Queue->Uri == *I)
                   {
                      R[0] = "STOP";