Georg Horn made the transfer timeout error message include more details

diff --git a/CHANGES b/CHANGES
index 3de71de50493f43dac5ec80cdfb7470a12a7715e..67ea6061411db1cb879e7b0b090b955501d5f007 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 56cbce9884f75996bb31321facee4485e4ba84ac..1eef7be4f0cf0d572a5304c56bf7643d5acd252e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -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)

diff --git a/lib/transfer.c b/lib/transfer.c
index 0af35104221303250d49b12a2e42db79e92df047..2ea07592da3a50558a65bab399c28594b6e7127b 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -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;
   }