diff options
| -rw-r--r-- | lib/cookie.h | 2 | ||||
| -rw-r--r-- | lib/transfer.c | 3 | ||||
| -rw-r--r-- | lib/url.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/cookie.h b/lib/cookie.h index bdd222b9c..22dc755c4 100644 --- a/lib/cookie.h +++ b/lib/cookie.h @@ -96,7 +96,7 @@ int Curl_cookie_output(struct CookieInfo *, char *); #if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_COOKIES) #define Curl_cookie_list(x) NULL -#define Curl_cookie_loadfiles(x) +#define Curl_cookie_loadfiles(x) do { } while (0) #else struct curl_slist *Curl_cookie_list(struct SessionHandle *data); void Curl_cookie_loadfiles(struct SessionHandle *data); diff --git a/lib/transfer.c b/lib/transfer.c index 2ea07592d..abcba2fcd 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1714,8 +1714,9 @@ CURLcode Curl_pretransfer(struct SessionHandle *data) data->state.authproxy.want = data->set.proxyauth; /* If there is a list of cookie files to read, do it now! */ - if(data->change.cookielist) + if(data->change.cookielist) { Curl_cookie_loadfiles(data); + } /* Allow data->set.use_port to set which port to use. This needs to be * disabled for example when we follow Location: headers to URLs using @@ -228,10 +228,11 @@ CURLcode Curl_close(struct SessionHandle *data) #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE); if(data->set.cookiejar) { - if(data->change.cookielist) + if(data->change.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(data); + } /* we have a "destination" for all the cookies to get dumped to */ if(Curl_cookie_output(data->cookies, data->set.cookiejar)) |