1
0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00

timer: restore PRETRANSFER timing

Regression introduced in 7.23.0 with commit 9dd85bce. The function in
which the PRETRANSFER time stamp was recorded was moved in time causing
it be stored very quickly after the start timestamp. On most systems
shorter than 1 millisecond and thus it wouldn't even show with -w
"%{time_pretransfer}" using the command line tool.

Bug: http://curl.haxx.se/mail/archive-2011-12/0022.html
Reported by: Toni Moreno
This commit is contained in:
Daniel Stenberg 2011-12-20 14:59:46 +01:00
parent eb6e9593c4
commit ce896875f8

View File

@ -5390,7 +5390,6 @@ static CURLcode do_init(struct connectdata *conn)
k->hbufp = data->state.headerbuff; k->hbufp = data->state.headerbuff;
k->ignorebody=FALSE; k->ignorebody=FALSE;
Curl_pgrsTime(data, TIMER_PRETRANSFER);
Curl_speedinit(data); Curl_speedinit(data);
Curl_pgrsSetUploadCounter(data, 0); Curl_pgrsSetUploadCounter(data, 0);
@ -5410,6 +5409,7 @@ static void do_complete(struct connectdata *conn)
conn->data->req.chunk=FALSE; conn->data->req.chunk=FALSE;
conn->data->req.maxfd = (conn->sockfd>conn->writesockfd? conn->data->req.maxfd = (conn->sockfd>conn->writesockfd?
conn->sockfd:conn->writesockfd)+1; conn->sockfd:conn->writesockfd)+1;
Curl_pgrsTime(conn->data, TIMER_PRETRANSFER);
} }
CURLcode Curl_do(struct connectdata **connp, bool *done) CURLcode Curl_do(struct connectdata **connp, bool *done)