Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/8bdea3cc7e7838b0d6c2eb33966724ed2138bf89
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/8bdea3cc7e7838b0d6c2eb33966724ed2138bf89
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/8bdea3cc7e7838b0d6c2eb33966724ed2138bf89

The branch, master has been updated
       via  8bdea3cc7e7838b0d6c2eb33966724ed2138bf89 (commit)
       via  8721279687f4b99b1b815c131257dee02d86553b (commit)
      from  1a57d0ab7af89b2896facbc71ef9f29584969470 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=8bdea3cc7e7838b0d6c2eb33966724ed2138bf89
commit 8bdea3cc7e7838b0d6c2eb33966724ed2138bf89
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    fix number of corestrings to test

diff --git a/test/corestrings.c b/test/corestrings.c
index e8f68c0..02640c9 100644
--- a/test/corestrings.c
+++ b/test/corestrings.c
@@ -35,6 +35,13 @@
 
 #include "test/malloc_fig.h"
 
+/**
+ * The number of corestrings.
+ *
+ * This is used to test all the out of memory paths in initialisation.
+ */
+#define CORESTRING_TEST_COUNT 435
+
 START_TEST(corestrings_test)
 {
        nserror ires;
@@ -58,7 +65,7 @@ static TCase *corestrings_case_create(void)
        TCase *tc;
        tc = tcase_create("corestrings");
 
-       tcase_add_loop_test(tc, corestrings_test, 0, 437);
+       tcase_add_loop_test(tc, corestrings_test, 0, CORESTRING_TEST_COUNT);
 
        return tc;
 }


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=8721279687f4b99b1b815c131257dee02d86553b
commit 8721279687f4b99b1b815c131257dee02d86553b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    update cookie database tests to not use expired cookie data

diff --git a/test/data/cookies b/test/data/cookies
index fc7a588..585c1e0 100644
--- a/test/data/cookies
+++ b/test/data/cookies
@@ -7,31 +7,31 @@
 # Version      Domain  Domain from Set-Cookie  Path    Path from Set-Cookie    
Secure  HTTP-Only       Expires Last used       No destroy      Name    Value   
Value was quoted        Scheme  URL     Comment
 Version:       102
 0      .theguardian.com        1       /       1       0       0       
1476054669      1468278669      0       GU_mvt_id       439080  0       unused  
unused  
-0      .reddit.com     1       /       1       0       1       1499814590      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
-0      .giffgaff.com   1       /       1       0       0       1503402870      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
-0      .google.com     1       /       1       0       1       1497632093      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
-0      .google.com     1       /       1       1       1       1497632093      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.com     1       /       1       1       0       1497632093      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      mail.google.com 0       /       1       1       1       1497632093      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
-0      mail.google.com 0       /mail   1       1       1       1497632094      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
-0      www.ccrexplorers.com    0       /       1       0       0       
1499619054      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
+0      .reddit.com     1       /       1       0       1       2147483647      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
+0      .giffgaff.com   1       /       1       0       0       2147483647      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
+0      .google.com     1       /       1       0       1       2147483647      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
+0      .google.com     1       /       1       1       1       2147483647      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.com     1       /       1       1       0       2147483647      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      mail.google.com 0       /       1       1       1       2147483647      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
+0      mail.google.com 0       /mail   1       1       1       2147483647      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
+0      www.ccrexplorers.com    0       /       1       0       0       
2147483647      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
 0      .theregister.co.uk      1       /       1       0       1       
1471944077      1468278443      0       __cfduid        
dbda67dd4386142349a936c252ebac7391440408077     0       unused  unused  
 0      nir.theregister.co.uk   0       /       1       0       0       
1470697643      0       0       c       1/front.front.578426ab  0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
-0      nir.theregister.co.uk   0       /       1       0       0       
1499814443      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
+0      nir.theregister.co.uk   0       /       1       0       0       
2147483647      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
 0      .regmedia.co.uk 1       /       1       0       1       1471944079      
1468278443      0       __cfduid        
d82e13431caf77499b09ccf54c21999941440408079     0       unused  unused  
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
-0      .google.co.uk   1       /       1       0       1       1497632093      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
-0      .google.co.uk   1       /       1       1       1       1497632093      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.co.uk   1       /       1       1       0       1497632093      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
+0      .google.co.uk   1       /       1       0       1       2147483647      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
+0      .google.co.uk   1       /       1       1       1       2147483647      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.co.uk   1       /       1       1       0       2147483647      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
 0      .google.co.uk   1       /       1       0       1       1484089690      
0       0       NID     
81=BGSfpwd63LrhVNUii2KYHfuyCUKzQv2Zg2ik1H_byGynWUgd9_q-kY48oCRapIewLtzMNYtf2KzYBk0_5OoAtNrD-0YSqXDzKalLWfQ8Vxwyywy79YDvAaX_3tprJzjp
     0       unused  unused  
-0      .bbc.co.uk      1       /       1       0       0       1595541997      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
-0      news.bbc.co.uk  0       /       1       0       0       1500933997      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
+0      .bbc.co.uk      1       /       1       0       0       2147483647      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
+0      news.bbc.co.uk  0       /       1       0       0       2147483647      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
 0      en.wikipedia.org        0       /       1       1       1       
1473249600      1470493303      0       WMF-Last-Access 06-Aug-2016     0       
http    http://en.wikipedia.org/wiki/Main_Page  
diff --git a/test/data/cookies-out b/test/data/cookies-out
index 143925a..404419e 100644
--- a/test/data/cookies-out
+++ b/test/data/cookies-out
@@ -6,26 +6,26 @@
 #
 # Version      Domain  Domain from Set-Cookie  Path    Path from Set-Cookie    
Secure  HTTP-Only       Expires Last used       No destroy      Name    Value   
Value was quoted        Scheme  URL     Comment
 Version:       102
-0      www.ccrexplorers.com    0       /       1       0       0       
1499619054      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
-0      .google.com     1       /       1       0       1       1497632093      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
-0      .google.com     1       /       1       1       1       1497632093      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.com     1       /       1       1       0       1497632093      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
-0      mail.google.com 0       /       1       1       1       1497632093      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
-0      mail.google.com 0       /mail   1       1       1       1497632094      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      .giffgaff.com   1       /       1       0       0       1503402870      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
-0      .reddit.com     1       /       1       0       1       1499814590      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
-0      .google.co.uk   1       /       1       0       1       1497632093      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
-0      .google.co.uk   1       /       1       1       1       1497632093      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.co.uk   1       /       1       1       0       1497632093      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
-0      nir.theregister.co.uk   0       /       1       0       0       
1499814443      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
-0      .bbc.co.uk      1       /       1       0       0       1595541997      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
-0      news.bbc.co.uk  0       /       1       0       0       1500933997      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
+0      www.ccrexplorers.com    0       /       1       0       0       
2147483647      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
+0      .google.com     1       /       1       0       1       2147483647      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
+0      .google.com     1       /       1       1       1       2147483647      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.com     1       /       1       1       0       2147483647      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      mail.google.com 0       /       1       1       1       2147483647      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
+0      mail.google.com 0       /mail   1       1       1       2147483647      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      .giffgaff.com   1       /       1       0       0       2147483647      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
+0      .reddit.com     1       /       1       0       1       2147483647      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
+0      .google.co.uk   1       /       1       0       1       2147483647      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
+0      .google.co.uk   1       /       1       1       1       2147483647      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.co.uk   1       /       1       1       0       2147483647      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      nir.theregister.co.uk   0       /       1       0       0       
2147483647      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
+0      .bbc.co.uk      1       /       1       0       0       2147483647      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
+0      news.bbc.co.uk  0       /       1       0       0       2147483647      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
diff --git a/test/urldbtest.c b/test/urldbtest.c
index 31cba2e..75a7210 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -571,6 +571,9 @@ static TCase *urldb_add_get_case_create(void)
  * Session basic test case
  *
  * The databases are loaded and saved with no manipulation
+ *
+ * \warning This test will fail when 32bit time_t wraps in 2038 as the
+ *           cookie database expiry field is limited to that size.
  */
 START_TEST(urldb_session_test)
 {
@@ -591,7 +594,7 @@ START_TEST(urldb_session_test)
        res = urldb_save(outnam);
        ck_assert_int_eq(res, NSERROR_OK);
 
-       /* check for the correct answer */
+       /* check the url database file written and the test file match */
        ck_assert_int_eq(cmp(outnam, test_urldb_out_path), 0);
 
        /* remove test output */
@@ -601,7 +604,7 @@ START_TEST(urldb_session_test)
        outnam = testnam(NULL);
        urldb_save_cookies(outnam);
 
-       /* check for the correct answer */
+       /* check the cookies file written and the test file match */
        ck_assert_int_eq(cmp(outnam, test_cookies_out_path), 0);
 
        /* remove test output */


-----------------------------------------------------------------------

Summary of changes:
 test/corestrings.c    |    9 ++++++++-
 test/data/cookies     |   46 +++++++++++++++++++++++-----------------------
 test/data/cookies-out |   46 +++++++++++++++++++++++-----------------------
 test/urldbtest.c      |    7 +++++--
 4 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/test/corestrings.c b/test/corestrings.c
index e8f68c0..02640c9 100644
--- a/test/corestrings.c
+++ b/test/corestrings.c
@@ -35,6 +35,13 @@
 
 #include "test/malloc_fig.h"
 
+/**
+ * The number of corestrings.
+ *
+ * This is used to test all the out of memory paths in initialisation.
+ */
+#define CORESTRING_TEST_COUNT 435
+
 START_TEST(corestrings_test)
 {
        nserror ires;
@@ -58,7 +65,7 @@ static TCase *corestrings_case_create(void)
        TCase *tc;
        tc = tcase_create("corestrings");
 
-       tcase_add_loop_test(tc, corestrings_test, 0, 437);
+       tcase_add_loop_test(tc, corestrings_test, 0, CORESTRING_TEST_COUNT);
 
        return tc;
 }
diff --git a/test/data/cookies b/test/data/cookies
index fc7a588..585c1e0 100644
--- a/test/data/cookies
+++ b/test/data/cookies
@@ -7,31 +7,31 @@
 # Version      Domain  Domain from Set-Cookie  Path    Path from Set-Cookie    
Secure  HTTP-Only       Expires Last used       No destroy      Name    Value   
Value was quoted        Scheme  URL     Comment
 Version:       102
 0      .theguardian.com        1       /       1       0       0       
1476054669      1468278669      0       GU_mvt_id       439080  0       unused  
unused  
-0      .reddit.com     1       /       1       0       1       1499814590      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
-0      .giffgaff.com   1       /       1       0       0       1503402870      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
-0      .google.com     1       /       1       0       1       1497632093      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
-0      .google.com     1       /       1       1       1       1497632093      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.com     1       /       1       1       0       1497632093      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      mail.google.com 0       /       1       1       1       1497632093      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
-0      mail.google.com 0       /mail   1       1       1       1497632094      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
-0      www.ccrexplorers.com    0       /       1       0       0       
1499619054      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
+0      .reddit.com     1       /       1       0       1       2147483647      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
+0      .giffgaff.com   1       /       1       0       0       2147483647      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
+0      .google.com     1       /       1       0       1       2147483647      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
+0      .google.com     1       /       1       1       1       2147483647      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.com     1       /       1       1       0       2147483647      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      mail.google.com 0       /       1       1       1       2147483647      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
+0      mail.google.com 0       /mail   1       1       1       2147483647      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
+0      www.ccrexplorers.com    0       /       1       0       0       
2147483647      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
 0      .theregister.co.uk      1       /       1       0       1       
1471944077      1468278443      0       __cfduid        
dbda67dd4386142349a936c252ebac7391440408077     0       unused  unused  
 0      nir.theregister.co.uk   0       /       1       0       0       
1470697643      0       0       c       1/front.front.578426ab  0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
-0      nir.theregister.co.uk   0       /       1       0       0       
1499814443      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
+0      nir.theregister.co.uk   0       /       1       0       0       
2147483647      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
 0      .regmedia.co.uk 1       /       1       0       1       1471944079      
1468278443      0       __cfduid        
d82e13431caf77499b09ccf54c21999941440408079     0       unused  unused  
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
-0      .google.co.uk   1       /       1       0       1       1497632093      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
-0      .google.co.uk   1       /       1       1       1       1497632093      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.co.uk   1       /       1       1       0       1497632093      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
+0      .google.co.uk   1       /       1       0       1       2147483647      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
+0      .google.co.uk   1       /       1       1       1       2147483647      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.co.uk   1       /       1       1       0       2147483647      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
 0      .google.co.uk   1       /       1       0       1       1484089690      
0       0       NID     
81=BGSfpwd63LrhVNUii2KYHfuyCUKzQv2Zg2ik1H_byGynWUgd9_q-kY48oCRapIewLtzMNYtf2KzYBk0_5OoAtNrD-0YSqXDzKalLWfQ8Vxwyywy79YDvAaX_3tprJzjp
     0       unused  unused  
-0      .bbc.co.uk      1       /       1       0       0       1595541997      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
-0      news.bbc.co.uk  0       /       1       0       0       1500933997      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
+0      .bbc.co.uk      1       /       1       0       0       2147483647      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
+0      news.bbc.co.uk  0       /       1       0       0       2147483647      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
 0      en.wikipedia.org        0       /       1       1       1       
1473249600      1470493303      0       WMF-Last-Access 06-Aug-2016     0       
http    http://en.wikipedia.org/wiki/Main_Page  
diff --git a/test/data/cookies-out b/test/data/cookies-out
index 143925a..404419e 100644
--- a/test/data/cookies-out
+++ b/test/data/cookies-out
@@ -6,26 +6,26 @@
 #
 # Version      Domain  Domain from Set-Cookie  Path    Path from Set-Cookie    
Secure  HTTP-Only       Expires Last used       No destroy      Name    Value   
Value was quoted        Scheme  URL     Comment
 Version:       102
-0      www.ccrexplorers.com    0       /       1       0       0       
1499619054      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
-0      .google.com     1       /       1       0       1       1497632093      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
-0      .google.com     1       /       1       1       1       1497632093      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
-0      .google.com     1       /       1       0       0       1497632093      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.com     1       /       1       1       0       1497632093      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
-0      mail.google.com 0       /       1       1       1       1497632093      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
-0      mail.google.com 0       /mail   1       1       1       1497632094      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      accounts.google.com     0       /       1       1       1       
1497632093      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
-0      .giffgaff.com   1       /       1       0       0       1503402870      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
-0      .reddit.com     1       /       1       0       1       1499814590      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
-0      www.reddit.com  0       /       1       1       0       1531350591      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
-0      .google.co.uk   1       /       1       0       1       1497632093      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
-0      .google.co.uk   1       /       1       1       1       1497632093      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
-0      .google.co.uk   1       /       1       0       0       1497632093      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
-0      .google.co.uk   1       /       1       1       0       1497632093      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
-0      nir.theregister.co.uk   0       /       1       0       0       
1499814443      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
-0      .bbc.co.uk      1       /       1       0       0       1595541997      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
-0      news.bbc.co.uk  0       /       1       0       0       1500933997      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
+0      www.ccrexplorers.com    0       /       1       0       0       
2147483647      1468082755      0       bb_lastvisit    1468083054      0       
http    http://www.ccrexplorers.com/forumdisplay.php?f=17       
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       SID     
DQAAAMoAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pfmO6LX8ezViJMABtqGPoO8Y8r8-eFRzLlsfbhCqM2OHkDRfoofXJCtIvDMi7Xyzoh6D5PsXbrfFZhcLSlfZpBtP
        0       unused  unused  
+0      .google.com     1       /       1       0       1       2147483647      
1470493285      0       HSID    A1rFmKHX-G1exnHNv       0       unused  unused  
+0      .google.com     1       /       1       1       1       2147483647      
1470493285      0       SSID    A4wVZcYgXrCrwWns8       0       unused  unused  
+0      .google.com     1       /       1       0       0       2147483647      
1470493285      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.com     1       /       1       1       0       2147483647      
1470493285      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      mail.google.com 0       /       1       1       1       2147483647      
1435272960      0       OSID    
DQAAANsAAABjm3QWm7iyror5Q-r_twvLnU2MeBpDTpzoY-d-4pEomtilsx1VjIp_SphmVJcv084Ilg4o1COlySeuNAVSkeYn6qPyK93aIKN7MOmQxKvYQXIAlPiBAXD7bVX2HoAQpDXKc1BQZUfL2wLIjCwns0NQVGawofTWf8gve_FAwp6hXF9hXHrZRTU9lgt3N0yBpjElda_UiyNkhUIZP27zSS1LpXh7GaYcUgM69IUrczTnfkfIX_XunEaXBT59fmc49pbFEYlMMURG3ydiPjIhGdN9eHO27V9JhxqhuYUryTM8kg
  0       https   
https://mail.google.com/accounts/SetOSID?continue=https%3A%2F%2Faccounts.google.co.uk%2Faccounts%2FSetSID%3Fssdc%3D1%26sidt%3DALWU2ctR9Uxp0qhL0HVYNURm01UOebegtyVV3GH%252BiVgIY9WIfqGs5NmqjVyX2IzkD0jDdGMV%252BgDLYwi9XrR%252FWsOIdwC4OO803V%252FimpsuKeLB7lk3%252FV10vr4C6wTc20A0I3ep6BLOe%252FQZgYJjfrcjzRiV2zT6fOiYXka1QrtyPIugR3R%252FaSWI%252Fau79w9hvBc%252FqqATVRi7F%252FDHv%252Be3cHMLPNOYoKwwUSOA9ORjKsyc5bCpnWM6X%252BrjsfzEEqlV5iui3EPKbBvTvCnfdF7UJjMg4EfWyMhVZaeytZdvGqJ2DfvPNmm2toULDQd4rcAAkfRZJQ95ySI4fq1ifZkfA0dhr7xnBQ0cl3%252BYTdl0yp%252BXjztO8YivQb%252Feip7gihmjfE9yRXoEboirDW8lIscN6cDDsuxzD07npdjHjRUX2wYrG4V3MLI4luH
 
O52mwY%252BHZMN3O681HumCIBYvX%26continue%3Dhttps%253A%252F%252Fmail.google.com%252Fmail%252F%253Fauth%253DDQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk&osidt=ALWU2cvhIheonCPoG5pecDWKf0i1a-AsQKBMvxay9B54taUbBKAxr9vzwWXg2UJDvM3oYcjYFVDxpERiv9sed5ZQXUKh9UPV5epNA25PUuVZwNDOkePm6agrIhUGR9wVz4x7I6-uU0uF4VHDwS1KDpWZvQY6tMw5vti1qF2bVdLMO_UTLcEW9mdV7Oze8OZXWxFsppfVGSxHN8N1rH8xRMCj3A5QjC-OU5h-pS3N4-AI4A5LwrMj_zvtwS0BW5otNhVmt503yBBXKIIkF5i4gGXiQGVVhCFlBeosv7KbWx97PEPTzeqf59R0ZgY9p1cd_jQWi0gYUmTn
       
+0      mail.google.com 0       /mail   1       1       1       2147483647      
1435272960      0       GX      
DQAAAMoAAADuReoJNLFTfcVkka4MpznqQGgtWpCWbF9qPINtXVzsE62rPcFtkl_t5MhqS9Ab1zrEmWlZefvaR2bknrPqFsBfVZAtMoThXQxvoQQ7K2A1XTWfEeX09w0dJvN0A8SXsjAEebTY93dZkJr5fMomABLkbizqoRqSkv6sh4x7Ysat6VGX6m6eTg81aiCjuBHzLwlAKx63On5joEI1qYhXvKF1JMc3oEzaETTv9mw-vXHt_J-YYlPQi_nG4jQKoDFJ-XCx1fjVVGlqBsPj5Pf1-SGT
        0       https   
https://mail.google.com/mail/?auth=DQAAAL8AAABzUu3D7vQTObQbtiQU-X_6NnwgrsDnQe_7yXrUrFrniwP5j04Q9jVgc203CAd7rwHnO0tvXTI8MSlRISJz3tGutyOc_uw5khR4FHviJuyTEuxKJZPUmQXnIWxZf_CQoJXGGaxn1kT0scUyrxiBjTfXllUWBVa5iuEzL2lgbAINKmSlLmyg3BaTFb-l0nmDdqGznAJMDgspYtD8iBTcPnOWpGkHXUVtkE0C6KK_3z1eULl0wEne4aU0LNJhlhUa8Xk
  
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       GAPS    
1:-F43DfTc9MQPBnPFtQw7SBXNDYxGRw:-byarQeQN13vrH8I       0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       LSID    
mail|o.mail.google.com|s.GB|ss:DQAAAMwAAADuReoJNLFTfcVkka4Mpznq77VRSAgK_50UNJQeyKZS6zdAktvmMi42CsHIKCA_qkMe373-3PwvTioyn8OGHoKi8a2tas-mS1US4KPOXsp6GrewaR6bwkvkAudNj5H97wu9p9uek5EMljgPSIcFHyTRDwGghHc918-Z5-QVQMYswD9fA8DObnL4iFPrYJyYsz2MJcYKOMTdgBc9cutZ-zgRVJLVV1IJiluuTeQb5pjfpX4ROfo8kf4M_boTxfuwO19fn_zp5jT9qdPr4jDBM9lM
 0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      accounts.google.com     0       /       1       1       1       
2147483647      0       0       ACCOUNT_CHOOSER 
AFx_qI5IqJoq6XeRvabQu34G7bErRw0LzimzBZXUqP_9H8Zh2kqTpBc-jooLHKNNCggYdxTq_ENRPogKK0V35Ap5s9N-88xwKmZLX7xXnZ25EBl-8FHjjvfMxKIj2-_xnpyKtWa5fWac
    0       https   
https://accounts.google.com/ServiceLogin?service=mail&passive=true&rm=false&continue=https://mail.google.com/mail/&ss=1&scc=1&ltmpl=default&ltmplcache=2&emr=1&osid=1
   
+0      .giffgaff.com   1       /       1       0       0       2147483647      
1440407964      0       visid_incap_456843      
MSQtdY7lSvK9UJiZDP3daK0S2lUAAAAAQUIPAAAAAAAudOMnRSt1V9mQN5dPPA+R        0       
unused  unused  
+0      .reddit.com     1       /       1       0       1       2147483647      
1468278656      0       __cfduid        
d2c9a13e6ed171f4318aabcf558fcc6661468278590     0       unused  unused  
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loid    lLGqu0nblR8T852T20      0       https   
https://www.reddit.com/ 
+0      www.reddit.com  0       /       1       1       0       2147483647      
1468278656      0       loidcreated     2016-07-11T23%3A09%3A50.925Z    0       
https   https://www.reddit.com/ 
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       SID     
DQAAAMkAAACuniK1mc17JMX-o-sfAVqvl0EWP0kiNpQg4lWeslWBnU_km8BK6Eww-1mC6zvnm7Jiv2vft4BOwWiAOmRzN66pbzxGNxKKGzSz2GNdWrcwvuYyQHkevwrtwmKmZGDKsgLljofq6NyNf0AP5xGXfHj18awhbbnymmv5UaDqypGx7FvptGQSMQkj_1hY6NJ5pflIfSnKeEn0Y2mEVyhc1qUiGcJhVKqIRd6xaGKk7l235kOpqxjGK7I4_jTQaORZbp2-RWozAg7SHESSaOpxQ0ZT
        0       unused  unused  
+0      .google.co.uk   1       /       1       0       1       2147483647      
1468278489      0       HSID    ANVWylWAbjjzFxKxI       0       unused  unused  
+0      .google.co.uk   1       /       1       1       1       2147483647      
1468278489      0       SSID    ANtGv1CSBG3CWbdtr       0       unused  unused  
+0      .google.co.uk   1       /       1       0       0       2147483647      
1468278489      0       APISID  IeJTJt20VmceF7bS/AACvc5cSFPpX8FJMj      0       
unused  unused  
+0      .google.co.uk   1       /       1       1       0       2147483647      
1468278489      0       SAPISID baCIIjpj-o3XQCkH/A-WEZgPvnNnguijDQ      0       
unused  unused  
+0      nir.theregister.co.uk   0       /       1       0       0       
2147483647      0       0       sa      1       0       http    
http://nir.theregister.co.uk/?g=c&g=sa&s=c/front.front  
+0      .bbc.co.uk      1       /       1       0       0       2147483647      
1470493359      0       BBC-UID 
35e7d9a5837b2e9d026d30f521339ac6826814226444c1ee4a2134fef248fe180NetSurf/3.6%20(Linux)
  0       unused  unused  
+0      news.bbc.co.uk  0       /       1       0       0       2147483647      
1469574171      0       BBC-UID 
25a73995333b5e9d8ea88a16a17c7b8beea45e555eb863e913853a4de2dcbdb80NetSurf%2f3%2e6%20%28Linux%29
  0       http    http://news.bbc.co.uk/  
diff --git a/test/urldbtest.c b/test/urldbtest.c
index 31cba2e..75a7210 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -571,6 +571,9 @@ static TCase *urldb_add_get_case_create(void)
  * Session basic test case
  *
  * The databases are loaded and saved with no manipulation
+ *
+ * \warning This test will fail when 32bit time_t wraps in 2038 as the
+ *           cookie database expiry field is limited to that size.
  */
 START_TEST(urldb_session_test)
 {
@@ -591,7 +594,7 @@ START_TEST(urldb_session_test)
        res = urldb_save(outnam);
        ck_assert_int_eq(res, NSERROR_OK);
 
-       /* check for the correct answer */
+       /* check the url database file written and the test file match */
        ck_assert_int_eq(cmp(outnam, test_urldb_out_path), 0);
 
        /* remove test output */
@@ -601,7 +604,7 @@ START_TEST(urldb_session_test)
        outnam = testnam(NULL);
        urldb_save_cookies(outnam);
 
-       /* check for the correct answer */
+       /* check the cookies file written and the test file match */
        ck_assert_int_eq(cmp(outnam, test_cookies_out_path), 0);
 
        /* remove test output */


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to