generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smtp: Fixed unknown percentage complete in progress bar

Browse Source 
The curl command line utility would display the the completed progress
bar with a percentage of zero as the progress routines didn't know the
size of the transfer.
This commit is contained in:
Steve Holme
2013-04-29 22:25:12 +01:00
parent 073e83b543
commit b52cf5d2cd
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE-NOTES
View File

@@ -37,6 +37,7 @@ This release includes the following bugfixes:
o sshserver: disable StrictHostKeyChecking o sshserver: disable StrictHostKeyChecking
o ftpserver: Fixed imap logout confirmation data o ftpserver: Fixed imap logout confirmation data
o curl_easy_init: use less mallocs o curl_easy_init: use less mallocs
o smtp: Fixed unknown percentage complete in progress bar
o o
This release includes the following known bugs: This release includes the following known bugs:

7
lib/smtp.c
View File

@@ -589,7 +589,7 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
} }
} }
/* calculate the optional SIZE parameter */ /* Calculate the optional SIZE parameter */
if(conn->proto.smtpc.size_supported && conn->data->set.infilesize > 0) { if(conn->proto.smtpc.size_supported && conn->data->set.infilesize > 0) {
size = aprintf("%" FORMAT_OFF_T, data->set.infilesize); size = aprintf("%" FORMAT_OFF_T, data->set.infilesize);
@@ -1172,6 +1172,8 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn, int smtpcode,
static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode, static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode,
smtpstate instate) smtpstate instate)
{ {
struct SessionHandle *data = conn->data;
(void)instate; /* no use for this yet */ (void)instate; /* no use for this yet */
if(smtpcode != 354) { if(smtpcode != 354) {
@@ -1179,6 +1181,9 @@ static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode,
return CURLE_SEND_ERROR; return CURLE_SEND_ERROR;
} }
/* Set the progress upload size */
Curl_pgrsSetUploadSize(data, data->set.infilesize);
/* SMTP upload */ /* SMTP upload */
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL); Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);