Fix missing URIStart() for https downloads

Add a explicit ReceivedData to HttpsMethod that indicates when
we got data from the connection so that we can send URISTart()
to the parent.

This is needed because URIStart got moved in f9b4f12d from
the progress_callback to write_data() and it only checks for
Res.Size. In the old code if progress_callback is called by
libcurl (and sets Res.Size) before write_data is called then
URIStart() is never send. Making this a explicit ReceivedData
variable fixes this issue.

diff --git a/methods/https.cc b/methods/https.cc
index 65a744e2a926fb07e90e49793b55d4e4103bb11a..3a5981b5824511a4cc9d9d74eb2f2bc3fbf475cd 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -85,8 +85,12 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    if (me->Server->JunkSize != 0)
       return buffer_size;
 
    if (me->Server->JunkSize != 0)
       return buffer_size;
 

-   if (me->Res.Size == 0)
+   if (me->ReceivedData == false)
+   {

       me->URIStart(me->Res);
       me->URIStart(me->Res);

+      me->ReceivedData = true;
+   }
+

    if(me->File->Write(buffer, buffer_size) != true)
       return false;
 
    if(me->File->Write(buffer, buffer_size) != true)
       return false;
 


@@ -95,7 +99,7 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 
 int
 HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
 
 int
 HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,

-                             double /*ultotal*/, double /*ulnow*/)
+                             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) {


@@ -179,6 +183,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    char curl_errorstr[CURL_ERROR_SIZE];
    URI Uri = Itm->Uri;
    string remotehost = Uri.Host;
    char curl_errorstr[CURL_ERROR_SIZE];
    URI Uri = Itm->Uri;
    string remotehost = Uri.Host;

+   ReceivedData = false;

 
    // TODO:
    //       - http::Pipeline-Depth
 
    // TODO:
    //       - http::Pipeline-Depth

diff --git a/methods/https.h b/methods/https.h
index faac8a3cdae8c247b103e44baaec5146d5d02fe3..411b71440119146e78166f94566437b510cb739f 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -66,6 +66,7 @@ class HttpsMethod : public pkgAcqMethod
    CURL *curl;
    FetchResult Res;
    HttpsServerState *Server;
    CURL *curl;
    FetchResult Res;
    HttpsServerState *Server;

+   bool ReceivedData;

 
    public:
    FileFd *File;
 
    public:
    FileFd *File;