diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/docs/curl.1 ../curl-2006-08-25_work/docs/curl.1 --- ../curl-2006-08-26/docs/curl.1 2006-07-27 01:20:47.000000000 +0200 +++ ../curl-2006-08-25_work/docs/curl.1 2006-08-26 16:45:27.000000000 +0200 @@ -1091,30 +1091,30 @@ curl CONNECT request. (Added in 7.12.4) .TP .B time_total -The total time, in seconds, that the full operation lasted. The time will be +The total time, in milliseconds, that the full operation lasted. The time will be displayed with millisecond resolution. .TP .B time_namelookup -The time, in seconds, it took from the start until the name resolving was +The time, in milliseconds, it took from the start until the name resolving was completed. .TP .B time_connect -The time, in seconds, it took from the start until the connect to the remote +The time, in milliseconds, it took from the start until the connect to the remote host (or proxy) was completed. .TP .B time_pretransfer -The time, in seconds, it took from the start until the file transfer is just +The time, in milliseconds, it took from the start until the file transfer is just about to begin. This includes all pre-transfer commands and negotiations that are specific to the particular protocol(s) involved. .TP .B time_redirect -The time, in seconds, it took for all redirection steps include name lookup, +The time, in milliseconds, it took for all redirection steps include name lookup, connect, pretransfer and transfer before final transaction was started. time_redirect shows the complete execution time for multiple redirections. (Added in 7.12.3) .TP .B time_starttransfer -The time, in seconds, it took from the start until the first byte is just about +The time, in milliseconds, it took from the start until the first byte is just about to be transferred. This includes time_pretransfer and also the time the server needs to calculate the result. .TP diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/docs/libcurl/curl_easy_getinfo.3 ../curl-2006-08-25_work/docs/libcurl/curl_easy_getinfo.3 --- ../curl-2006-08-26/docs/libcurl/curl_easy_getinfo.3 2006-06-08 13:06:26.000000000 +0200 +++ ../curl-2006-08-25_work/docs/libcurl/curl_easy_getinfo.3 2006-08-26 16:47:11.000000000 +0200 @@ -63,26 +63,26 @@ to \fIcurl_easy_setopt(3)\fP or you will unconditionally get a -1 back. (Added in 7.5) .IP CURLINFO_TOTAL_TIME -Pass a pointer to a double to receive the total time in seconds for the +Pass a pointer to a long to receive the total time in milliseconds for the previous transfer, including name resolving, TCP connect etc. .IP CURLINFO_NAMELOOKUP_TIME -Pass a pointer to a double to receive the time, in seconds, it took from the +Pass a pointer to a long to receive the time, in milliseconds, it took from the start until the name resolving was completed. .IP CURLINFO_CONNECT_TIME -Pass a pointer to a double to receive the time, in seconds, it took from the +Pass a pointer to a long to receive the time, in milliseconds, it took from the start until the connect to the remote host (or proxy) was completed. .IP CURLINFO_PRETRANSFER_TIME -Pass a pointer to a double to receive the time, in seconds, it took from the +Pass a pointer to a long to receive the time, in milliseconds, it took from the start until the file transfer is just about to begin. This includes all pre-transfer commands and negotiations that are specific to the particular protocol(s) involved. .IP CURLINFO_STARTTRANSFER_TIME -Pass a pointer to a double to receive the time, in seconds, it took from the +Pass a pointer to a long to receive the time, in milliseconds, it took from the start until the first byte is just about to be transferred. This includes CURLINFO_PRETRANSFER_TIME and also the time the server needs to calculate the result. .IP CURLINFO_REDIRECT_TIME -Pass a pointer to a double to receive the total time, in seconds, it took for +Pass a pointer to a long to receive the total time, in milliseconds, it took for all redirection steps include name lookup, connect, pretransfer and transfer before final transaction was started. CURLINFO_REDIRECT_TIME contains the complete execution time for multiple redirections. (Added in 7.9.7) diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/include/curl/curl.h ../curl-2006-08-25_work/include/curl/curl.h --- ../curl-2006-08-26/include/curl/curl.h 2006-08-04 18:08:41.000000000 +0200 +++ ../curl-2006-08-25_work/include/curl/curl.h 2006-08-26 11:33:28.000000000 +0200 @@ -1346,10 +1346,10 @@ CURLINFO_NONE, /* first, never use this */ CURLINFO_EFFECTIVE_URL = CURLINFO_STRING + 1, CURLINFO_RESPONSE_CODE = CURLINFO_LONG + 2, - CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE + 3, - CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE + 4, - CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE + 5, - CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6, + CURLINFO_TOTAL_TIME = CURLINFO_LONG + 3, + CURLINFO_NAMELOOKUP_TIME = CURLINFO_LONG + 4, + CURLINFO_CONNECT_TIME = CURLINFO_LONG + 5, + CURLINFO_PRETRANSFER_TIME = CURLINFO_LONG + 6, CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE + 7, CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE + 8, CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE + 9, @@ -1360,9 +1360,9 @@ CURLINFO_FILETIME = CURLINFO_LONG + 14, CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE + 15, CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE + 16, - CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17, + CURLINFO_STARTTRANSFER_TIME = CURLINFO_LONG + 17, CURLINFO_CONTENT_TYPE = CURLINFO_STRING + 18, - CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE + 19, + CURLINFO_REDIRECT_TIME = CURLINFO_LONG + 19, CURLINFO_REDIRECT_COUNT = CURLINFO_LONG + 20, CURLINFO_PRIVATE = CURLINFO_STRING + 21, CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG + 22, diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/lib/getinfo.c ../curl-2006-08-25_work/lib/getinfo.c --- ../curl-2006-08-26/lib/getinfo.c 2006-08-08 20:47:14.000000000 +0200 +++ ../curl-2006-08-25_work/lib/getinfo.c 2006-08-26 11:01:12.000000000 +0200 @@ -124,19 +124,19 @@ *param_longp = data->info.request_size; break; case CURLINFO_TOTAL_TIME: - *param_doublep = data->progress.timespent; + *param_longp = data->progress.timespent; break; case CURLINFO_NAMELOOKUP_TIME: - *param_doublep = data->progress.t_nslookup; + *param_longp = data->progress.t_nslookup; break; case CURLINFO_CONNECT_TIME: - *param_doublep = data->progress.t_connect; + *param_longp = data->progress.t_connect; break; case CURLINFO_PRETRANSFER_TIME: - *param_doublep = data->progress.t_pretransfer; + *param_longp = data->progress.t_pretransfer; break; case CURLINFO_STARTTRANSFER_TIME: - *param_doublep = data->progress.t_starttransfer; + *param_longp = data->progress.t_starttransfer; break; case CURLINFO_SIZE_UPLOAD: *param_doublep = (double)data->progress.uploaded; @@ -160,7 +160,7 @@ *param_doublep = (double)data->progress.size_ul; break; case CURLINFO_REDIRECT_TIME: - *param_doublep = data->progress.t_redirect; + *param_longp = data->progress.t_redirect; break; case CURLINFO_REDIRECT_COUNT: *param_longp = data->set.followlocation; diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/lib/progress.c ../curl-2006-08-25_work/lib/progress.c --- ../curl-2006-08-26/lib/progress.c 2004-11-26 15:33:14.000000000 +0100 +++ ../curl-2006-08-25_work/lib/progress.c 2006-08-26 11:40:43.000000000 +0200 @@ -146,10 +146,10 @@ /* reset all times except redirect */ void Curl_pgrsResetTimes(struct SessionHandle *data) { - data->progress.t_nslookup = 0.0; - data->progress.t_connect = 0.0; - data->progress.t_pretransfer = 0.0; - data->progress.t_starttransfer = 0.0; + data->progress.t_nslookup = 0; + data->progress.t_connect = 0; + data->progress.t_pretransfer = 0; + data->progress.t_starttransfer = 0; } void Curl_pgrsTime(struct SessionHandle *data, timerid timer) @@ -166,26 +166,26 @@ case TIMER_NAMELOOKUP: data->progress.t_nslookup = - Curl_tvdiff_secs(Curl_tvnow(), data->progress.t_startsingle); + Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle); break; case TIMER_CONNECT: data->progress.t_connect = - Curl_tvdiff_secs(Curl_tvnow(), data->progress.t_startsingle); + Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle); break; case TIMER_PRETRANSFER: data->progress.t_pretransfer = - Curl_tvdiff_secs(Curl_tvnow(), data->progress.t_startsingle); + Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle); break; case TIMER_STARTTRANSFER: data->progress.t_starttransfer = - Curl_tvdiff_secs(Curl_tvnow(), data->progress.t_startsingle); + Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle); break; case TIMER_POSTRANSFER: /* this is the normal end-of-transfer thing */ break; case TIMER_REDIRECT: data->progress.t_redirect = - Curl_tvdiff_secs(Curl_tvnow(), data->progress.start); + Curl_tvdiff(Curl_tvnow(), data->progress.start); break; } } @@ -267,7 +267,7 @@ now = Curl_tvnow(); /* what time is it */ /* The time spent so far (from the start) */ - data->progress.timespent = Curl_tvdiff_secs(now, data->progress.start); + data->progress.timespent = Curl_tvdiff(now, data->progress.start); timespent = (long)data->progress.timespent; /* The average download speed this far */ diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/lib/urldata.h ../curl-2006-08-25_work/lib/urldata.h --- ../curl-2006-08-26/lib/urldata.h 2006-08-19 23:18:37.000000000 +0200 +++ ../curl-2006-08-25_work/lib/urldata.h 2006-08-26 11:01:22.000000000 +0200 @@ -812,16 +812,16 @@ int width; /* screen width at download start */ int flags; /* see progress.h */ - double timespent; + long timespent; curl_off_t dlspeed; curl_off_t ulspeed; - double t_nslookup; - double t_connect; - double t_pretransfer; - double t_starttransfer; - double t_redirect; + long t_nslookup; + long t_connect; + long t_pretransfer; + long t_starttransfer; + long t_redirect; struct timeval start; struct timeval t_startsingle; diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/src/hugehelp.c ../curl-2006-08-25_work/src/hugehelp.c --- ../curl-2006-08-26/src/hugehelp.c 2006-08-26 11:29:52.000000000 +0200 +++ ../curl-2006-08-25_work/src/hugehelp.c 2006-08-26 16:48:56.000000000 +0200 @@ -2,7 +2,7 @@ #ifndef HAVE_LIBZ /* * NEVER EVER edit this manually, fix the mkhelp.pl script instead! - * Generation time: Sat Aug 26 11:29:50 2006 + * Generation time: Sat Aug 26 11:05:49 2006 */ #include "setup.h" #ifdef USE_MANUAL @@ -1544,24 +1544,24 @@ " response (from a proxy) to a curl CONNECT\n" " request. (Added in 7.12.4)\n" "\n" -" time_total The total time, in seconds, that the full opera-\n" +" time_total The total time, in milliseconds, that the full opera-\n" , stdout); fputs( " tion lasted. The time will be displayed with mil-\n" " lisecond resolution.\n" "\n" " time_namelookup\n" -" The time, in seconds, it took from the start\n" +" The time, in milliseconds, it took from the start\n" " until the name resolving was completed.\n" "\n" -" time_connect The time, in seconds, it took from the start\n" +" time_connect The time, in milliseconds, it took from the start\n" " until the connect to the remote host (or proxy)\n" , stdout); fputs( " was completed.\n" "\n" " time_pretransfer\n" -" The time, in seconds, it took from the start\n" +" The time, in milliseconds, it took from the start\n" " until the file transfer is just about to begin.\n" " This includes all pre-transfer commands and nego-\n" " tiations that are specific to the particular pro-\n" @@ -1569,7 +1569,7 @@ "\n" , stdout); fputs( -" time_redirect The time, in seconds, it took for all redirection\n" +" time_redirect The time, in milliseconds, it took for all redirection\n" " steps include name lookup, connect, pretransfer\n" " and transfer before final transaction was\n" " started. time_redirect shows the complete\n" @@ -1579,7 +1579,7 @@ " time_starttransfer\n" , stdout); fputs( -" The time, in seconds, it took from the start\n" +" The time, in milliseconds, it took from the start\n" " until the first byte is just about to be trans-\n" " ferred. This includes time_pretransfer and also\n" " the time the server needs to calculate the\n" @@ -3044,7 +3044,7 @@ #else /* * NEVER EVER edit this manually, fix the mkhelp.pl script instead! - * Generation time: Sat Aug 26 11:29:51 2006 + * Generation time: Sat Aug 26 11:05:50 2006 */ #include "setup.h" #ifdef USE_MANUAL diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/src/writeenv.c ../curl-2006-08-25_work/src/writeenv.c --- ../curl-2006-08-26/src/writeenv.c 2004-12-15 02:38:25.000000000 +0100 +++ ../curl-2006-08-25_work/src/writeenv.c 2006-08-26 11:02:07.000000000 +0200 @@ -46,11 +46,11 @@ { {"curl_url_effective", CURLINFO_EFFECTIVE_URL, writeenv_STRING}, {"curl_http_code", CURLINFO_RESPONSE_CODE, writeenv_LONG}, - {"curl_time_total", CURLINFO_TOTAL_TIME, writeenv_DOUBLE}, - {"curl_time_namelookup", CURLINFO_NAMELOOKUP_TIME, writeenv_DOUBLE}, - {"curl_time_connect", CURLINFO_CONNECT_TIME, writeenv_DOUBLE}, - {"curl_time_pretransfer", CURLINFO_PRETRANSFER_TIME, writeenv_DOUBLE}, - {"curl_time_starttransfer", CURLINFO_STARTTRANSFER_TIME, writeenv_DOUBLE}, + {"curl_time_total", CURLINFO_TOTAL_TIME, writeenv_LONG}, + {"curl_time_namelookup", CURLINFO_NAMELOOKUP_TIME, writeenv_LONG}, + {"curl_time_connect", CURLINFO_CONNECT_TIME, writeenv_LONG}, + {"curl_time_pretransfer", CURLINFO_PRETRANSFER_TIME, writeenv_LONG}, + {"curl_time_starttransfer", CURLINFO_STARTTRANSFER_TIME, writeenv_LONG}, {"curl_size_header", CURLINFO_HEADER_SIZE, writeenv_LONG}, {"curl_size_request", CURLINFO_REQUEST_SIZE, writeenv_LONG}, {"curl_size_download", CURLINFO_SIZE_DOWNLOAD, writeenv_DOUBLE}, diff -ru -x '\.deps' -x '\.libs' ../curl-2006-08-26/src/writeout.c ../curl-2006-08-25_work/src/writeout.c --- ../curl-2006-08-26/src/writeout.c 2006-03-21 23:30:03.000000000 +0100 +++ ../curl-2006-08-25_work/src/writeout.c 2006-08-26 11:38:58.000000000 +0200 @@ -161,34 +161,34 @@ break; case VAR_REDIRECT_TIME: if(CURLE_OK == - curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME, &doubleinfo)) - fprintf(stream, "%.3f", doubleinfo); + curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME, &longinfo)) + fprintf(stream, "%ld", longinfo); break; case VAR_TOTAL_TIME: if(CURLE_OK == - curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &doubleinfo)) - fprintf(stream, "%.3f", doubleinfo); + curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &longinfo)) + fprintf(stream, "%ld", longinfo); break; case VAR_NAMELOOKUP_TIME: if(CURLE_OK == curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME, - &doubleinfo)) - fprintf(stream, "%.3f", doubleinfo); + &longinfo)) + fprintf(stream, "%ld", longinfo); break; case VAR_CONNECT_TIME: if(CURLE_OK == - curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &doubleinfo)) - fprintf(stream, "%.3f", doubleinfo); + curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &longinfo)) + fprintf(stream, "%ld", longinfo); break; case VAR_PRETRANSFER_TIME: if(CURLE_OK == - curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &doubleinfo)) - fprintf(stream, "%.3f", doubleinfo); + curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &longinfo)) + fprintf(stream, "%ld", longinfo); break; case VAR_STARTTRANSFER_TIME: if(CURLE_OK == - curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &doubleinfo)) - fprintf(stream, "%.3f", doubleinfo); + curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &longinfo)) + fprintf(stream, "%ld", longinfo); break; case VAR_SIZE_UPLOAD: if(CURLE_OK ==