#include "url.h"
#include "getinfo.h"
#include "hostip.h"
+#include "share.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
{
struct SessionHandle *data = (struct SessionHandle *)curl;
- if (Curl_global_host_cache_use(data) && data->hostcache != Curl_global_host_cache_get()) {
- if (data->hostcache) {
- Curl_hash_destroy(data->hostcache);
+ if ( ! (data->share && data->share->hostcache) ) {
+
+ if (Curl_global_host_cache_use(data) &&
+ data->hostcache != Curl_global_host_cache_get()) {
+ if (data->hostcache)
+ Curl_hash_destroy(data->hostcache);
+ data->hostcache = Curl_global_host_cache_get();
}
- data->hostcache = Curl_global_host_cache_get();
- }
- if (!data->hostcache) {
- data->hostcache = Curl_hash_alloc(7, Curl_freednsinfo);
+ if (!data->hostcache)
+ data->hostcache = Curl_hash_alloc(7, Curl_freednsinfo);
+
}
return Curl_perform(data);
void curl_easy_cleanup(CURL *curl)
{
struct SessionHandle *data = (struct SessionHandle *)curl;
- if (!Curl_global_host_cache_use(data)) {
- Curl_hash_destroy(data->hostcache);
+ if ( ! (data->share && data->share->hostcache) ) {
+ if ( !Curl_global_host_cache_use(data)) {
+ Curl_hash_destroy(data->hostcache);
+ }
}
Curl_close(data);
}
}
if(data->cookies) {
+ Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
co = Curl_cookie_getlist(data->cookies,
conn->allocptr.cookiehost?
conn->allocptr.cookiehost:host, ppath,
(bool)(conn->protocol&PROT_HTTPS?TRUE:FALSE));
+ Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
}
if (conn->bits.httpproxy &&
break;
case CURL_LOCK_DATA_COOKIE:
+ if (!share->cookies) {
+ share->cookies = Curl_cookie_init( NULL, NULL, TRUE );
+ }
break;
case CURL_LOCK_DATA_SSL_SESSION:
break;
case CURL_LOCK_DATA_COOKIE:
+ if (share->cookies) {
+ Curl_cookie_cleanup(share->cookies);
+ share->cookies = NULL;
+ }
break;
case CURL_LOCK_DATA_SSL_SESSION:
if (share->dirty)
return CURLSHE_IN_USE;
+ if(share->hostcache)
+ Curl_hash_destroy(share->hostcache);
+
+ if(share->cookies)
+ Curl_cookie_cleanup(share->cookies);
+
free (share);
return CURLSHE_OK;
CURLSHcode
-Curl_share_lock(struct SessionHandle *data, curl_lock_data type, curl_lock_access access)
+Curl_share_lock(struct SessionHandle *data, curl_lock_data type,
+ curl_lock_access access)
{
struct Curl_share *share = data->share;
#include "setup.h"
#include <curl/curl.h>
+#include "cookie.h"
/* this struct is libcurl-private, don't export details */
struct Curl_share {
void *clientdata;
curl_hash *hostcache;
+ struct CookieInfo *cookies;
};
CURLSHcode Curl_share_lock (
}
else if(data->cookies &&
checkprefix("Set-Cookie:", k->p)) {
+ Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
Curl_cookie_add(data->cookies, TRUE, k->p+11,
/* If there is a custom-set Host: name, use it
here, or else use real peer host name. */
conn->allocptr.cookiehost?
conn->allocptr.cookiehost:conn->name,
conn->ppath);
+ Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
}
else if(checkprefix("Last-Modified:", k->p) &&
(data->set.timecondition || data->set.get_filetime) ) {
do it now! */
if(data->change.cookielist) {
struct curl_slist *list = data->change.cookielist;
+ Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
while(list) {
data->cookies = Curl_cookie_init(list->data,
data->cookies,
data->set.cookiesession);
list = list->next;
}
+ Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
curl_slist_free_all(data->change.cookielist); /* clean up list */
data->change.cookielist = NULL; /* don't do this again! */
}
Curl_SSL_Close_All(data);
#endif
- /* No longer a dirty share, if it exists */
- if (data->share)
- data->share->dirty--;
-
if(data->change.cookielist) /* clean up list if any */
curl_slist_free_all(data->change.cookielist);
Curl_safefree(data->state.headerbuff);
#ifndef CURL_DISABLE_HTTP
+ Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
if(data->set.cookiejar) {
/* we have a "destination" for all the cookies to get dumped to */
if(Curl_cookie_output(data->cookies, data->set.cookiejar))
infof(data, "WARNING: failed to save cookies in given jar\n");
}
- Curl_cookie_cleanup(data->cookies);
+ if( !data->share || (data->cookies != data->share->cookies) ) {
+ Curl_cookie_cleanup(data->cookies);
+ }
+ Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
#endif
/* free the connection cache */
Curl_digest_cleanup(data);
+ /* No longer a dirty share, if it exists */
+ if (data->share)
+ data->share->dirty--;
+
free(data);
return CURLE_OK;
}
{
struct Curl_share *set;
set = va_arg(param, struct Curl_share *);
- if(data->share)
- {
+
+ /* disconnect from old share, if any */
+ if(data->share) {
Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE);
- /* checking the dns cache stuff */
if(data->share->hostcache == data->hostcache)
- {
data->hostcache = NULL;
- }
+
+ if(data->share->cookies == data->cookies)
+ data->cookies = NULL;
data->share->dirty--;
Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
+ data->share = NULL;
}
+ /* use new share if it set */
data->share = set;
+ if(data->share) {
+
+ Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE);
- Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE);
+ data->share->dirty++;
- data->share->dirty++;
+ if(data->share->hostcache) {
+ /* use shared host cache, first free own one if any */
+ if(data->hostcache)
+ Curl_hash_destroy(data->hostcache);
- if( data->hostcache )
- {
- Curl_hash_destroy(data->hostcache);
- data->hostcache = data->share->hostcache;
+ data->hostcache = data->share->hostcache;
+ }
+
+ if(data->share->cookies) {
+ /* use shared cookie list, first free own one if any */
+ if (data->cookies)
+ Curl_cookie_cleanup(data->cookies);
+ data->cookies = data->share->cookies;
+ }
+
+ Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
+
}
- Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
+ /* check cookie list is set */
+ if(!data->cookies)
+ data->cookies = Curl_cookie_init( NULL, NULL, TRUE );
+
+ /* check for host cache not needed,
+ * it will be done by curl_easy_perform */
}
break;