From bf601472a0f09ff5fa80a048f22a30ac9edac304 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 22 Feb 2021 13:03:02 +0100 Subject: [PATCH] multi: do once-per-transfer inits in before_perform in DID state ... since the state machine might go to RATELIMITING and then back to PERFORMING doing once-per-transfer inits in that function is wrong and it caused problems with receiving chunked HTTP and it set the PRETRANSFER time much too often... Regression from b68dc34af341805aeb7b3715 (shipped in 7.75.0) Reported-by: Amaury Denoyelle Fixes #6640 Closes #6641 --- lib/multi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/multi.c b/lib/multi.c index 2a8a2df965..9de3f40084 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -105,8 +105,8 @@ static const char * const statename[]={ /* function pointer called once when switching TO a state */ typedef void (*init_multistate_func)(struct Curl_easy *data); -/* called when the PERFORM state starts */ -static void init_perform(struct Curl_easy *data) +/* called in DID state, before PERFORMING state */ +static void before_perform(struct Curl_easy *data) { data->req.chunk = FALSE; Curl_pgrsTime(data, TIMER_PRETRANSFER); @@ -142,8 +142,8 @@ static void mstate(struct Curl_easy *data, CURLMstate state Curl_connect_free, /* DO */ NULL, /* DOING */ NULL, /* DOING_MORE */ - NULL, /* DID */ - init_perform, /* PERFORMING */ + before_perform, /* DID */ + NULL, /* PERFORMING */ NULL, /* RATELIMITING */ NULL, /* DONE */ init_completed, /* COMPLETED */