Year 2038 has its own problems (32 bit integer overflow).

So cookie expiration date is lowered to expire at most in 2035.

diff --git a/tests/data/test31 b/tests/data/test31
index 5211d3a5b52bdb9a0f3a15979ff394da6173fc01..080071f138237e787f466412d8b4760e7013af10 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -22,10 +22,10 @@ Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;
 Set-Cookie:eat=this; domain=moo.foo.moo;\r
 Set-Cookie: eat=this-too; domain=.foo.moo;\r
 Set-Cookie: nodomainnovalue\r
-Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 GMT 2038\r
+Set-Cookie:   nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035\r
 Set-Cookie: novalue; domain=reallysilly\r
-Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038\r
-Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 GMT 2038\r
+Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030\r
+Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030\r
 \r
 boo
 </data>
@@ -62,7 +62,7 @@ Accept: */*
 
 .127.0.0.1     TRUE    /silly/ FALSE   0       ismatch this
 .127.0.0.1     TRUE    /       FALSE   0       partmatch       present
-127.0.0.1      FALSE   /we/want/       FALSE   2147483647      nodomain        value
+127.0.0.1      FALSE   /we/want/       FALSE   2054030187      nodomain        value
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test46 b/tests/data/test46
index 0ef4b5e47a1d6635f1c597c695d51b40ab2a6204..de60f7cc7ba51cb9bacdacd449db00ec0abb79a0 100644 (file)
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -14,7 +14,7 @@ HTTP/1.1 200 OK
 Server: Microsoft-IIS/4.0
 Date: Tue, 25 Sep 2001 19:37:44 GMT
 Content-Type: text/html
-Set-Cookie: ckyPersistent=permanent; expires=Tue, 01-Feb-2038 11:56:27 GMT; path=/
+Set-Cookie: ckyPersistent=permanent; expires=Fri, 02-Feb-2035 11:56:27 GMT; path=/
 Set-Cookie: ckySession=temporary; path=/
 Set-Cookie: ASPSESSIONIDQGGQQSJJ=GKNBDIFAAOFDPDAIEAKDIBKE; path=/
 Set-Cookie: justaname=; path=/;
@@ -70,7 +70,7 @@ www.fake.come FALSE   /       FALSE   1022144953      cookiecliente   si
 www.loser.com  FALSE   /       FALSE   1139150993      UID     99
 127.0.0.1      FALSE   /       FALSE   1439150993      mooo    indeed
 127.0.0.1      FALSE   /       FALSE   0       empty   
-127.0.0.1      FALSE   /       FALSE   2147483647      ckyPersistent   permanent
+127.0.0.1      FALSE   /       FALSE   2054030187      ckyPersistent   permanent
 127.0.0.1      FALSE   /       FALSE   0       ckySession      temporary
 127.0.0.1      FALSE   /       FALSE   0       ASPSESSIONIDQGGQQSJJ    GKNBDIFAAOFDPDAIEAKDIBKE
 127.0.0.1      FALSE   /       FALSE   0       justaname       

diff --git a/tests/data/test506 b/tests/data/test506
index b186f1f213a8eaaf1c9db39072c11360b8462213..1d658f3fa7a7d505dac538c57a2c6019452853bd 100644 (file)
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -6,9 +6,9 @@ HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
-Set-Cookie: test1=one; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
-Set-Cookie: test2=two; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
-Set-Cookie: test3=three; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test1=one; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
+Set-Cookie: test2=two; domain=host.foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
+Set-Cookie: test3=three; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
 Content-Length: 29
 
 run 1: set cookie 1, 2 and 3
@@ -18,8 +18,8 @@ HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:01 GMT
 Server: test-server/fake
 Content-Type: text/html
-Set-Cookie: test4=four; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
-Set-Cookie: test5=five; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test4=four; domain=host.foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
+Set-Cookie: test5=five; domain=host.foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
 Content-Length: 26
 
 run 2: set cookie 4 and 5
@@ -30,8 +30,8 @@ Date: Thu, 09 Nov 2010 14:49:02 GMT
 Server: test-server/fake
 Content-Type: text/html
 Funny-head: yesyes
-Set-Cookie: test4=overwritten4; domain=host.foo.com; expires=Thu Dec 31 23:59:59 GMT 2009
-Set-Cookie: test1=overwritten1; domain=foo.com; expires=Tue Feb 2 11:56:27 GMT 2007
+Set-Cookie: test4=overwritten4; domain=host.foo.com; expires=Sat May 5 GMT 11:56:27 2035
+Set-Cookie: test1=overwritten1; domain=foo.com; expires=Thu Mar 3 GMT 11:56:27 2033
 Content-Type: text/html
 Content-Length: 32
 
@@ -154,11 +154,11 @@ http://%HOSTIP:%HTTPPORT/506
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
-.foo.com       TRUE    /       FALSE   1170417387      test1   overwritten1
-.host.foo.com  TRUE    /       FALSE   2147483647      test2   two
-.foo.com       TRUE    /       FALSE   2147483647      test3   three
-.host.foo.com  TRUE    /       FALSE   1262303999      test4   overwritten4
-.host.foo.com  TRUE    /       FALSE   2147483647      test5   five
+.foo.com       TRUE    /       FALSE   1993463787      test1   overwritten1
+.host.foo.com  TRUE    /       FALSE   1896263787      test2   two
+.foo.com       TRUE    /       FALSE   1896263787      test3   three
+.host.foo.com  TRUE    /       FALSE   2061978987      test4   overwritten4
+.host.foo.com  TRUE    /       FALSE   1896263787      test5   five
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test61 b/tests/data/test61
index 44cf95962bb9a77945f2cb53c014b92f287a589d..c776c9f826f219aa5c9de3a78518598507330a0a 100644 (file)
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -16,8 +16,8 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake\r
 Content-Type: text/html\r
 Funny-head: yesyes\r
-Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038\r
-Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038\r
+Set-Cookie: test=yes; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2035\r
+Set-Cookie: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035\r
 Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure\r
 Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure\r
 Set-Cookie: test5=name; domain=anything.com; path=/ ; secure\r
@@ -56,8 +56,8 @@ Host: www.host.foo.com
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
-.foo.com       TRUE    /we/want/       FALSE   2147483647      test    yes
-.host.foo.com  TRUE    /we/want/       FALSE   2147483647      test2   yes
+.foo.com       TRUE    /we/want/       FALSE   2054030187      test    yes
+.host.foo.com  TRUE    /we/want/       FALSE   2054030187      test2   yes
 .foo.com       TRUE    /moo    TRUE    0       test3   maybe
 </file>
 </verify>

diff --git a/tests/data/test62 b/tests/data/test62
index f0e4240c69c19b22c82079bd6e2b6b99f8f2d009..cba6317b8c40ce6d1a4b1416b5a4bfe095f027f5 100644 (file)
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -33,9 +33,9 @@ http://%HOSTIP:%HTTPPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com"
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
-.foo.com       TRUE    /we/want/       FALSE   2147483647      test    yes
-.host.foo.com  TRUE    /we/want/       FALSE   2147483647      test2   yes
-.fake.host.foo.com     TRUE    /we/want/       FALSE   2147483647      test4   yes
+.foo.com       TRUE    /we/want/       FALSE   2054030187      test    yes
+.host.foo.com  TRUE    /we/want/       FALSE   2054030187      test2   yes
+.fake.host.foo.com     TRUE    /we/want/       FALSE   2054030187      test4   yes
 
 .foo.com       TRUE    /moo    TRUE    0       test3   maybe
 </file>