From: Jiri Hruska <jirka@fud.cz>
Date: Fri, 1 Mar 2013 18:38:27 +0000 (+0100)
Subject: imap: Updated setting of transfer variables in imap_state_fetch_resp()
X-Git-Tag: curl-7_30_0~222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d46d107e0cc421f74e1ed632b14cc72c2ffb2c14;p=thirdparty%2Fcurl.git

imap: Updated setting of transfer variables in imap_state_fetch_resp()

Add number of bytes retrieved from the PP cache to req.bytecount and set
req.maxdownload only when starting a proper download.
---

diff --git a/lib/imap.c b/lib/imap.c
index 8b00b216d8..dcc6d6b6e3 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1294,6 +1294,7 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
       if(result)
         return result;
 
+      data->req.bytecount += chunk;
       size -= chunk;
 
       infof(data, "Written %" FORMAT_OFF_TU " bytes, %" FORMAT_OFF_TU
@@ -1317,11 +1318,11 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
     if(!size)
       /* The entire data is already transferred! */
       Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
-    else
+    else {
       /* IMAP download */
+      data->req.maxdownload = size;
       Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, NULL, -1, NULL);
-
-    data->req.maxdownload = size;
+    }
   }
   else {
     /* We don't know how to parse this line */