From 2bd75e5686b2e6ff3824c4dfb2b6ec86b60f454c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 2 Jun 2022 15:45:27 +0200 Subject: [PATCH] easy/transfer: fix cookie-disabled build Follow-up from 45de940cebf6a Reported-by: Marcel Raad Fixes #8953 Closes #8954 --- lib/easy.c | 4 ++++ lib/transfer.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/easy.c b/lib/easy.c index bd9d695bb5..336cada878 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -838,6 +838,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) outcurl->progress.flags = data->progress.flags; outcurl->progress.callback = data->progress.callback; +#ifndef CURL_DISABLE_COOKIES if(data->cookies) { /* If cookies are enabled in the parent handle, we enable them in the clone as well! */ @@ -856,6 +857,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) if(!outcurl->state.cookielist) goto fail; } +#endif if(data->state.url) { outcurl->state.url = strdup(data->state.url); @@ -937,8 +939,10 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) fail: if(outcurl) { +#ifndef CURL_DISABLE_COOKIES curl_slist_free_all(outcurl->state.cookielist); outcurl->state.cookielist = NULL; +#endif Curl_safefree(outcurl->state.buffer); Curl_dyn_free(&outcurl->state.headerb); Curl_safefree(outcurl->state.url); diff --git a/lib/transfer.c b/lib/transfer.c index 27eec8a46b..01f764ac50 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1422,10 +1422,11 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) else data->state.infilesize = 0; +#ifndef CURL_DISABLE_COOKIES /* If there is a list of cookie files to read, do it now! */ if(data->state.cookielist) Curl_cookie_loadfiles(data); - +#endif /* If there is a list of host pairs to deal with */ if(data->state.resolve) result = Curl_loadhostpairs(data); -- 2.47.3