libcurl: update to 7.88.0

1 files changed, 7 insertions, 17 deletions

diff --git a/libs/libcurl/src/cookie.c b/libs/libcurl/src/cookie.c
index b9b18fc62c..ccb25cdc51 100644
--- a/libs/libcurl/src/cookie.c
+++ b/libs/libcurl/src/cookie.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -329,7 +329,7 @@ static char *sanitize_cookie_path(const char *cookie_path)
  */

 void Curl_cookie_loadfiles(struct Curl_easy *data)

 {

-  struct curl_slist *list = data->state.cookielist;

+  struct curl_slist *list = data->set.cookielist;

   if(list) {

     Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);

     while(list) {

@@ -347,8 +347,6 @@ void Curl_cookie_loadfiles(struct Curl_easy *data)
         data->cookies = newcookies;

       list = list->next;

     }

-    curl_slist_free_all(data->state.cookielist); /* clean up list */

-    data->state.cookielist = NULL; /* don't do this again! */

     Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);

   }

 }

@@ -1301,7 +1299,7 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
      */

     remove_expired(c);

 

-    if(fromfile && fp)

+    if(fromfile)

       fclose(fp);

   }

 

@@ -1800,12 +1798,10 @@ void Curl_flush_cookies(struct Curl_easy *data, bool cleanup)
   CURLcode res;

 

   if(data->set.str[STRING_COOKIEJAR]) {

-    if(data->state.cookielist) {

-      /* If there is a list of cookie files to read, do it first so that

-         we have all the told files read before we write the new jar.

-         Curl_cookie_loadfiles() LOCKS and UNLOCKS the share itself! */

-      Curl_cookie_loadfiles(data);

-    }

+    /* If there is a list of cookie files to read, do it first so that

+       we have all the told files read before we write the new jar.

+       Curl_cookie_loadfiles() LOCKS and UNLOCKS the share itself! */

+    Curl_cookie_loadfiles(data);

 

     Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);

 

@@ -1816,12 +1812,6 @@ void Curl_flush_cookies(struct Curl_easy *data, bool cleanup)
             data->set.str[STRING_COOKIEJAR], curl_easy_strerror(res));

   }

   else {

-    if(cleanup && data->state.cookielist) {

-      /* since nothing is written, we can just free the list of cookie file

-         names */

-      curl_slist_free_all(data->state.cookielist); /* clean up list */

-      data->state.cookielist = NULL;

-    }

     Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);

   }