1. cookie expire-strings MUST use GMT timezones

2. adjusted date strings to upcoming date parser rewrite

5 files changed, 23 insertions, 23 deletions

diff --git a/tests/data/test31 b/tests/data/test31
index 692b12d84..ac2e4e59e 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -13,10 +13,10 @@ Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;
 Set-Cookie:eat=this; domain=moo.foo.moo;

 Set-Cookie: eat=this-too; domain=.foo.moo;

 Set-Cookie: nodomainnovalue

-Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 MET 2014

+Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 GMT 2014

 Set-Cookie: novalue; domain=reallysilly

-Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 MET 2007

-Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 MET 2007

+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007

+Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 GMT 2007

 

 boo
 </data>
@@ -54,6 +54,6 @@ 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	1391252187	nodomain	value
+127.0.0.1	FALSE	/we/want/	FALSE	1391255787	nodomain	value
 </file>
 </verify>
diff --git a/tests/data/test506 b/tests/data/test506
index 4fbf5f81d..d43ac91d3 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -5,9 +5,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 MET 2007
-Set-Cookie: test2=two; domain=host.foo.com; expires=Tue Feb 1 11:56:27 MET 2007
-Set-Cookie: test3=three; domain=foo.com; expires=Tue Feb 1 11:56:27 MET 2007
+Set-Cookie: test1=one; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test2=two; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test3=three; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
 Content-Length: 29
 
 run 1: set cookie 1, 2 and 3
@@ -17,8 +17,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 MET 2007
-Set-Cookie: test5=five; domain=host.foo.com; expires=Tue Feb 1 11:56:27 MET 2007
+Set-Cookie: test4=four; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test5=five; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
 Content-Length: 26
 
 run 2: set cookie 4 and 5
@@ -29,8 +29,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 MET 2009
-Set-Cookie: test1=overwritten1; domain=foo.com; expires=Tue Feb 2 11:56:27 MET 2007
+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
 Content-Type: text/html
 Content-Length: 32
 
@@ -146,10 +146,10 @@ http://%HOSTIP:%HTTPPORT/506
 # http://www.netscape.com/newsref/std/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
-.foo.com	TRUE	/	FALSE	1170413787	test1	overwritten1
-.host.foo.com	TRUE	/	FALSE	1170327387	test2	two
-.foo.com	TRUE	/	FALSE	1170327387	test3	three
-.host.foo.com	TRUE	/	FALSE	1262300399	test4	overwritten4
-.host.foo.com	TRUE	/	FALSE	1170327387	test5	five
+.foo.com	TRUE	/	FALSE	1170417387	test1	overwritten1
+.host.foo.com	TRUE	/	FALSE	1170330987	test2	two
+.foo.com	TRUE	/	FALSE	1170330987	test3	three
+.host.foo.com	TRUE	/	FALSE	1262303999	test4	overwritten4
+.host.foo.com	TRUE	/	FALSE	1170330987	test5	five
 </file>
 </verify>
diff --git a/tests/data/test61 b/tests/data/test61
index 3fbed6a8a..8e22996ee 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -6,8 +6,8 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake

 Content-Type: text/html

 Funny-head: yesyes

-Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 MET 2007

-Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 MET 2007

+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007

+Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007

 Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure

 Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure

 Set-Cookie: test5=name; domain=anything.com; path=/ ; secure

@@ -47,8 +47,8 @@ Host: www.host.foo.com
 # http://www.netscape.com/newsref/std/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
-.foo.com	TRUE	/we/want/	FALSE	1170327387	test	yes
-.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test2	yes
+.foo.com	TRUE	/we/want/	FALSE	1170330987	test	yes
+.host.foo.com	TRUE	/we/want/	FALSE	1170330987	test2	yes
 .foo.com	TRUE	/moo	TRUE	0	test3	maybe
 </file>
 </verify>
diff --git a/tests/data/test77 b/tests/data/test77
index 4ba1220f0..85c336274 100644
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -26,7 +26,7 @@ http
 HTTP with -z "older date"
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/77 -z "1999-12-12 12:00:00 MET"
+http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -41,7 +41,7 @@ GET /77 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT

 Pragma: no-cache

 Accept: */*

-If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT

+If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT

 

 </protocol>
 </verify>
diff --git a/tests/data/test78 b/tests/data/test78
index 156099a3a..401c011f6 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -38,7 +38,7 @@ http
 HTTP with -z "newer date"
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/78 -z "1999-12-12 12:00:00 MET"
+http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
 </command>
 </client>