From e582497322428f72343115f055e9e198047fe3b4 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 13 Sep 2016 23:17:28 +0100 Subject: [PATCH] if the cookie is a session cookie indicate it previously session cookies were simply displayed as having an expiry in 1970 which was unhelpful. --- content/urldb.c | 6 ++++++ desktop/cookie_manager.c | 8 +++++++- resources/FatMessages | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/content/urldb.c b/content/urldb.c index b27e23c17..4888afcfe 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -112,6 +112,12 @@ #include "content/content.h" #include "content/urldb.h" +/** + * cookie entry. + * + * \warn This *must* be kept in sync with the public interface in + * netsurf/cookie_db.h + */ struct cookie_internal_data { struct cookie_internal_data *prev; /**< Previous in list */ struct cookie_internal_data *next; /**< Next in list */ diff --git a/desktop/cookie_manager.c b/desktop/cookie_manager.c index 3f48dad5c..d3d5a7d7e 100644 --- a/desktop/cookie_manager.c +++ b/desktop/cookie_manager.c @@ -294,8 +294,14 @@ cookie_manager_set_treeview_field_data(struct cookie_manager_entry *e, &e->data[COOKIE_M_PATH], strdup(data->path)); /* Set the Expires date field */ - cookie_manager_field_builder_time(COOKIE_M_EXPIRES, + if (data->expires == -1) { + cookie_manager_field_builder(COOKIE_M_EXPIRES, + &e->data[COOKIE_M_EXPIRES], + strdup(messages_get("CookieManagerSession"))); + } else { + cookie_manager_field_builder_time(COOKIE_M_EXPIRES, &e->data[COOKIE_M_EXPIRES], &data->expires); + } /* Set the Last used date field */ cookie_manager_field_builder_time(COOKIE_M_LAST_USED, diff --git a/resources/FatMessages b/resources/FatMessages index 7e080387a..9fb5939a0 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -1273,6 +1273,7 @@ nl.all.TreeviewLabelFolder:Map: # Cookie Manager field values # +en.all.CookieManagerSession:Session en.all.CookieManagerHTTPS:Secure hosts via https only de.all.CookieManagerHTTPS:Secure hosts via https only fr.all.CookieManagerHTTPS:Hôtes sécurisés via https uniquement