luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

urldata: remove now from struct SingleRequest - not needed

Browse Source 
Closes #10549
This commit is contained in:
Stefan Eissing 2023-02-17 12:53:13 +01:00 committed by Daniel Stenberg
parent b30b0c3840
commit e187d69e48
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/transfer.c
View File

@ -1055,6 +1055,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
{ {
struct SingleRequest *k = &data->req; struct SingleRequest *k = &data->req;
CURLcode result; CURLcode result;
struct curltime now;
int didwhat = 0; int didwhat = 0;
curl_socket_t fd_read; curl_socket_t fd_read;
@ -1124,7 +1125,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
} }
#endif #endif
k->now = Curl_now(); now = Curl_now();
if(!didwhat) { if(!didwhat) {
/* no read no write, this is a timeout? */ /* no read no write, this is a timeout? */
if(k->exp100 == EXP100_AWAITING_CONTINUE) { if(k->exp100 == EXP100_AWAITING_CONTINUE) {
@ -1141,7 +1142,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
*/ */
timediff_t ms = Curl_timediff(k->now, k->start100); timediff_t ms = Curl_timediff(now, k->start100);
if(ms >= data->set.expect_100_timeout) { if(ms >= data->set.expect_100_timeout) {
/* we've waited long enough, continue anyway */ /* we've waited long enough, continue anyway */
k->exp100 = EXP100_SEND_DATA; k->exp100 = EXP100_SEND_DATA;
@ -1159,23 +1160,23 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if(Curl_pgrsUpdate(data)) if(Curl_pgrsUpdate(data))
result = CURLE_ABORTED_BY_CALLBACK; result = CURLE_ABORTED_BY_CALLBACK;
else else
result = Curl_speedcheck(data, k->now); result = Curl_speedcheck(data, now);
if(result) if(result)
goto out; goto out;
if(k->keepon) { if(k->keepon) {
if(0 > Curl_timeleft(data, &k->now, FALSE)) { if(0 > Curl_timeleft(data, &now, FALSE)) {
if(k->size != -1) { if(k->size != -1) {
failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
" milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %" " milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %"
CURL_FORMAT_CURL_OFF_T " bytes received", CURL_FORMAT_CURL_OFF_T " bytes received",
Curl_timediff(k->now, data->progress.t_startsingle), Curl_timediff(now, data->progress.t_startsingle),
k->bytecount, k->size); k->bytecount, k->size);
} }
else { else {
failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
" milliseconds with %" CURL_FORMAT_CURL_OFF_T " bytes received", " milliseconds with %" CURL_FORMAT_CURL_OFF_T " bytes received",
Curl_timediff(k->now, data->progress.t_startsingle), Curl_timediff(now, data->progress.t_startsingle),
k->bytecount); k->bytecount);
} }
result = CURLE_OPERATION_TIMEDOUT; result = CURLE_OPERATION_TIMEDOUT;

1
lib/url.c
View File

@ -3962,7 +3962,6 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
data->state.httpreq = HTTPREQ_HEAD; data->state.httpreq = HTTPREQ_HEAD;
k->start = Curl_now(); /* start time */ k->start = Curl_now(); /* start time */
k->now = k->start; /* current time is now */
k->header = TRUE; /* assume header */ k->header = TRUE; /* assume header */
k->bytecount = 0; k->bytecount = 0;
k->ignorebody = FALSE; k->ignorebody = FALSE;

1
lib/urldata.h
View File

@ -630,7 +630,6 @@ struct SingleRequest {
curl_off_t pendingheader; /* this many bytes left to send is actually curl_off_t pendingheader; /* this many bytes left to send is actually
header and not body */ header and not body */
struct curltime start; /* transfer started at this time */ struct curltime start; /* transfer started at this time */
struct curltime now; /* current time */
enum { enum {
HEADER_NORMAL, /* no bad header at all */ HEADER_NORMAL, /* no bad header at all */
HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest