summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-09-13 22:17:28 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-09-13 22:17:28 (GMT)
commite582497322428f72343115f055e9e198047fe3b4 (patch)
tree900bd37d3dd885acaf064dc6777eea3b72701b71
parentc830d14d0bd06dda4eaf7de27ae97b826173afe1 (diff)
downloadnetsurf-e582497322428f72343115f055e9e198047fe3b4.tar.gz
netsurf-e582497322428f72343115f055e9e198047fe3b4.tar.bz2
if the cookie is a session cookie indicate it
previously session cookies were simply displayed as having an expiry in 1970 which was unhelpful.
-rw-r--r--content/urldb.c6
-rw-r--r--desktop/cookie_manager.c8
-rw-r--r--resources/FatMessages1
3 files changed, 14 insertions, 1 deletions
diff --git a/content/urldb.c b/content/urldb.c
index b27e23c..4888afc 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 3f48dad..d3d5a7d 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 7e08038..9fb5939 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