moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

cookies: use lock when using CURLINFO_COOKIELIST

Browse Source 
Closes #1896
This commit is contained in:
Pavel P 2017-09-18 15:50:16 -07:00 committed by Daniel Stenberg
parent c73ebb8537
commit 5fe85587cc
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cookie.c
View File

@ -1402,7 +1402,7 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere)
return 0; return 0;
} }
struct curl_slist *Curl_cookie_list(struct Curl_easy *data) static struct curl_slist *cookie_list(struct Curl_easy *data)
{ {
struct curl_slist *list = NULL; struct curl_slist *list = NULL;
struct curl_slist *beg; struct curl_slist *beg;
@ -1433,6 +1433,15 @@ struct curl_slist *Curl_cookie_list(struct Curl_easy *data)
return list; return list;
} }
struct curl_slist *Curl_cookie_list(struct Curl_easy *data)
{
struct curl_slist *list;
Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
list = cookie_list(data);
Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
return list;
}
void Curl_flush_cookies(struct Curl_easy *data, int cleanup) void Curl_flush_cookies(struct Curl_easy *data, int cleanup)
{ {
if(data->set.str[STRING_COOKIEJAR]) { if(data->set.str[STRING_COOKIEJAR]) {

16
tests/data/test506
View File

@ -195,6 +195,8 @@ CURLOPT_COOKIEJAR
CURLOPT_COOKIELIST RELOAD CURLOPT_COOKIELIST RELOAD
lock: cookie [Pigs in space]: 78 lock: cookie [Pigs in space]: 78
unlock: cookie [Pigs in space]: 79 unlock: cookie [Pigs in space]: 79
lock: cookie [Pigs in space]: 80
unlock: cookie [Pigs in space]: 81
loaded cookies: loaded cookies:
----------------- -----------------
.host.foo.com TRUE / FALSE 1896263787 injected yes .host.foo.com TRUE / FALSE 1896263787 injected yes
@ -207,17 +209,17 @@ loaded cookies:
www.host.foo.com FALSE / FALSE 1993463787 test6 six_more www.host.foo.com FALSE / FALSE 1993463787 test6 six_more
----------------- -----------------
try SHARE_CLEANUP... try SHARE_CLEANUP...
lock: share [Pigs in space]: 80 lock: share [Pigs in space]: 82
unlock: share [Pigs in space]: 81 unlock: share [Pigs in space]: 83
SHARE_CLEANUP failed, correct SHARE_CLEANUP failed, correct
CLEANUP CLEANUP
lock: cookie [Pigs in space]: 82 lock: cookie [Pigs in space]: 84
unlock: cookie [Pigs in space]: 83 unlock: cookie [Pigs in space]: 85
lock: share [Pigs in space]: 84
unlock: share [Pigs in space]: 85
SHARE_CLEANUP
lock: share [Pigs in space]: 86 lock: share [Pigs in space]: 86
unlock: share [Pigs in space]: 87 unlock: share [Pigs in space]: 87
SHARE_CLEANUP
lock: share [Pigs in space]: 88
unlock: share [Pigs in space]: 89
GLOBAL_CLEANUP GLOBAL_CLEANUP
</stdout> </stdout>
<stderr> <stderr>