aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/imap.c10
-rw-r--r--lib/pop3.c10
-rw-r--r--lib/smtp.c10
3 files changed, 12 insertions, 18 deletions
diff --git a/lib/imap.c b/lib/imap.c
index 136d64379..6ce6b12ec 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -2222,20 +2222,18 @@ static CURLcode imap_regular_transfer(struct connectdata *conn,
/* Make sure size is unknown at this point */
data->req.size = -1;
+ /* Set the progress data */
Curl_pgrsSetUploadCounter(data, 0);
Curl_pgrsSetDownloadCounter(data, 0);
Curl_pgrsSetUploadSize(data, 0);
Curl_pgrsSetDownloadSize(data, 0);
+ /* Carry out the perform */
result = imap_perform(conn, &connected, dophase_done);
- if(!result) {
- if(!*dophase_done)
- /* The DO phase has not completed yet */
- return CURLE_OK;
-
+ /* Perform post DO phase operations if necessary */
+ if(!result && *dophase_done)
result = imap_dophase_done(conn, connected);
- }
return result;
}
diff --git a/lib/pop3.c b/lib/pop3.c
index 28a359ebe..4c008cafb 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1594,20 +1594,18 @@ static CURLcode pop3_regular_transfer(struct connectdata *conn,
/* Make sure size is unknown at this point */
data->req.size = -1;
+ /* Set the progress data */
Curl_pgrsSetUploadCounter(data, 0);
Curl_pgrsSetDownloadCounter(data, 0);
Curl_pgrsSetUploadSize(data, 0);
Curl_pgrsSetDownloadSize(data, 0);
+ /* Carry out the perform */
result = pop3_perform(conn, &connected, dophase_done);
- if(!result) {
- if(!*dophase_done)
- /* The DO phase has not completed yet */
- return CURLE_OK;
-
+ /* Perform post DO phase operations if necessary */
+ if(!result && *dophase_done)
result = pop3_dophase_done(conn, connected);
- }
return result;
}
diff --git a/lib/smtp.c b/lib/smtp.c
index 21c202e3c..c9669dafc 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1593,20 +1593,18 @@ static CURLcode smtp_regular_transfer(struct connectdata *conn,
/* Make sure size is unknown at this point */
data->req.size = -1;
+ /* Set the progress data */
Curl_pgrsSetUploadCounter(data, 0);
Curl_pgrsSetDownloadCounter(data, 0);
Curl_pgrsSetUploadSize(data, 0);
Curl_pgrsSetDownloadSize(data, 0);
+ /* Carry out the perform */
result = smtp_perform(conn, &connected, dophase_done);
- if(!result) {
- if(!*dophase_done)
- /* The DO phase has not completed yet */
- return CURLE_OK;
-
+ /* Perform post DO phase operations if necessary */
+ if(!result && *dophase_done)
result = smtp_dophase_done(conn, connected);
- }
return result;
}