Commit f36adcdb authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Georg Horn made the transfer timeout error message include more details

parent 13616f8f

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


                                  Changelog



Daniel (25 July 2006)

- Georg Horn made the transfer timeout error message include more details.



Daniel (20 July 2006)

- David McCreedy fixed a build error when building libcurl with HTTP disabled,

  problem added with the curl_formget() patch.

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ This release would not have looked like this without help, code, reports and 
advice from friends like these:



 Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner, Toshiyuki Maezawa,

 Ingmar Runge, Ates Goral, David McCreedy, Jari Sundell

 Ingmar Runge, Ates Goral, David McCreedy, Jari Sundell, Georg Horn,

 Gisle Vanem, Yang Tse



        Thanks! (and sorry if I forgot to mention someone)

lib/transfer.c

+9 −3
Original line number Diff line number Diff line
@@ -1419,9 +1419,15 @@ CURLcode Curl_readwrite(struct connectdata *conn, 


  if (data->set.timeout &&

      ((Curl_tvdiff(k->now, k->start)/1000) >= data->set.timeout)) {

    failf(data, "Operation timed out with %" FORMAT_OFF_T

          " out of %" FORMAT_OFF_T " bytes received",

          k->bytecount, conn->size);

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

      failf(data, "Operation timed out after %d seconds with %"

            FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received",

            data->set.timeout, k->bytecount, conn->size);

    } else {

      failf(data, "Operation timed out after %d seconds with %"

            FORMAT_OFF_T " bytes received",

            data->set.timeout, k->bytecount);

    }

    return CURLE_OPERATION_TIMEOUTED;

  }