summaryrefslogtreecommitdiff
path: root/lib/cookie.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-09-27 09:41:43 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-09-28 18:10:43 +0200
commitd0a7ee3f613b0c3f2370c6cc81e5aafef67120f0 (patch)
tree84313021ed566a898a897112ddc7982e2e89a00d /lib/cookie.c
parented735091574122fd5b2f5bac1edc56d5f03aa969 (diff)
downloadcurl-d0a7ee3f613b0c3f2370c6cc81e5aafef67120f0.tar.gz
cookies: using a share with cookies shouldn't enable the cookie engine
The 'share object' only sets the storage area for cookies. The "cookie engine" still needs to be enabled or activated using the normal cookie options. This caused the curl command line tool to accidentally use cookies without having been told to, since curl switched to using shared cookies in 7.66.0. Test 1166 verifies Updated test 506 Fixes #4429 Closes #4434
Diffstat (limited to 'lib/cookie.c')
-rw-r--r--lib/cookie.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/cookie.c b/lib/cookie.c
index 0e71129de..f6b52df2f 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -1090,6 +1090,8 @@ Curl_cookie_add(struct Curl_easy *data,
*
* If 'newsession' is TRUE, discard all "session cookies" on read from file.
*
+ * Note that 'data' might be called as NULL pointer.
+ *
* Returns NULL on out of memory. Invalid cookies are ignored.
****************************************************************************/
struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
@@ -1160,6 +1162,8 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
}
c->running = TRUE; /* now, we're running */
+ if(data)
+ data->state.cookie_engine = TRUE;
return c;