aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Bug 886: Postpone resaving the cookies until a bottom half.

Browse Source 
[ From commit b79210ea1b in ELinks
  0.12.GIT.  --KON ]
This commit is contained in:
Kalle Olavi Niemitalo 2006-12-09 16:24:24 +02:00 committed by Kalle Olavi Niemitalo
parent 89f1e654c6
commit f311f3ea93
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/cookies/cookies.c
View File

@ -29,6 +29,7 @@
#include "intl/gettext/libintl.h" #include "intl/gettext/libintl.h"
#include "main/module.h" #include "main/module.h"
#include "main/object.h" #include "main/object.h"
#include "main/select.h"
#include "protocol/date.h" #include "protocol/date.h"
#include "protocol/header.h" #include "protocol/header.h"
#include "protocol/protocol.h" #include "protocol/protocol.h"
@ -62,6 +63,7 @@ static INIT_LIST_HEAD(c_domains);
static INIT_LIST_HEAD(cookie_servers); static INIT_LIST_HEAD(cookie_servers);
/* Only @set_cookies_dirty may make this nonzero. */
static int cookies_dirty = 0; static int cookies_dirty = 0;
enum cookies_option { enum cookies_option {
@ -468,7 +470,7 @@ accept_cookie(struct cookie *cookie)
} }
add_to_list(cookies, cookie); add_to_list(cookies, cookie);
cookies_dirty = 1; set_cookies_dirty();
/* XXX: This crunches CPU too. --pasky */ /* XXX: This crunches CPU too. --pasky */
foreach (cd, c_domains) foreach (cd, c_domains)
@ -482,9 +484,6 @@ accept_cookie(struct cookie *cookie)
memcpy(cd->domain, cookie->domain, domain_len + 1); memcpy(cd->domain, cookie->domain, domain_len + 1);
add_to_list(c_domains, cd); add_to_list(c_domains, cd);
if (get_cookies_save() && get_cookies_resave())
save_cookies();
} }
#if 0 #if 0
@ -511,9 +510,6 @@ delete_cookie(struct cookie *c)
end: end:
del_from_list(c); del_from_list(c);
done_cookie(c); done_cookie(c);
if (get_cookies_save() && get_cookies_resave())
save_cookies();
} }
@ -641,7 +637,7 @@ send_cookies(struct uri *uri)
#endif #endif
delete_cookie(c); delete_cookie(c);
cookies_dirty = 1; set_cookies_dirty();
continue; continue;
} }
@ -662,9 +658,6 @@ send_cookies(struct uri *uri)
mem_free(path); mem_free(path);
if (cookies_dirty && get_cookies_save() && get_cookies_resave())
save_cookies();
if (!header.length) { if (!header.length) {
done_string(&header); done_string(&header);
return NULL; return NULL;
@ -734,7 +727,7 @@ load_cookies(void) {
/* Skip expired cookies if any. */ /* Skip expired cookies if any. */
expires = str_to_time_t(members[EXPIRES].pos); expires = str_to_time_t(members[EXPIRES].pos);
if (!expires || expires <= now) { if (!expires || expires <= now) {
cookies_dirty = 1; set_cookies_dirty();
continue; continue;
} }
@ -765,6 +758,30 @@ load_cookies(void) {
fclose(fp); fclose(fp);
} }
static void
resave_cookies_bottom_half(void *always_null)
{
if (get_cookies_save() && get_cookies_resave())
save_cookies(); /* checks cookies_dirty */
}
/* Note that the cookies have been modified, and register a bottom
* half for saving them if appropriate. We use a bottom half so that
* if something makes multiple changes and calls this for each change,
* the cookies get saved only once at the end. */
void
set_cookies_dirty(void)
{
/* Do not check @cookies_dirty here. If the previous attempt
* to save cookies failed, @cookies_dirty can still be nonzero
* even though @resave_cookies_bottom_half is no longer in the
* queue. */
cookies_dirty = 1;
/* If @resave_cookies_bottom_half is already in the queue,
* @register_bottom_half does nothing. */
register_bottom_half(resave_cookies_bottom_half, NULL);
}
void void
save_cookies(void) { save_cookies(void) {
struct cookie *c; struct cookie *c;

1
src/cookies/cookies.h
View File

@ -43,6 +43,7 @@ void delete_cookie(struct cookie *);
void set_cookie(struct uri *, unsigned char *); void set_cookie(struct uri *, unsigned char *);
void load_cookies(void); void load_cookies(void);
void save_cookies(void); void save_cookies(void);
void set_cookies_dirty(void);
/* Note that the returned value points to a static structure and thus the /* Note that the returned value points to a static structure and thus the
* string will be overwritten at the next call time. The string source * string will be overwritten at the next call time. The string source