Commit bbc1705f authored by Colin Hogben's avatar Colin Hogben Committed by Daniel Stenberg
Browse files

error message: Sensible message on timeout when transfer size unknown 

A transfer timeout could result in an error message such as "Operation
timed out after 3000 milliseconds with 19 bytes of -1 received".  This
patch removes the non-sensical "of -1" when the size of the transfer
is unknown, mirroring the logic in lib/transfer.c
parent 87ade5f0

lib/multi.c

+13 −5
Original line number Diff line number Diff line
@@ -985,11 +985,19 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
                Curl_tvdiff(now, data->progress.t_startsingle));

        else {

          k = &data->req;

          if(k->size != -1) {

            failf(data, "Operation timed out after %ld milliseconds with %"

                  CURL_FORMAT_CURL_OFF_T " out of %"

                  CURL_FORMAT_CURL_OFF_T " bytes received",

                Curl_tvdiff(now, data->progress.t_startsingle), k->bytecount,

                k->size);

                  Curl_tvdiff(k->now, data->progress.t_startsingle),

                  k->bytecount, k->size);

          }

          else {

            failf(data, "Operation timed out after %ld milliseconds with %"

                  CURL_FORMAT_CURL_OFF_T " bytes received",

                  Curl_tvdiff(now, data->progress.t_startsingle),

                  k->bytecount);

          }

        }



        /* Force the connection closed because the server could continue to