diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-09-14 16:20:47 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-15 14:37:36 +0200 |
| commit | 54f6d836d8f2407e841fcda1684662aff34b8cb1 (patch) | |
| tree | c70e61aecf3c53ef2d5919aa79f0fb243b4a1fca /tests/data | |
| parent | d5a70e77b2ba43a27ecba1c400b52e2c22b4fa6d (diff) | |
| download | curl-54f6d836d8f2407e841fcda1684662aff34b8cb1.tar.gz | |
hsts: handle unlimited expiry
When setting a blank expire string, meaning unlimited, curl would pass
TIME_T_MAX to getime_r() when creating the output, while on 64 bit
systems such a large value cannot be convetered to a tm struct making
curl to exit the loop with an error instead. It can't be converted
because the year it would represent doesn't fit in the 'int tm_year'
field!
Starting now, unlimited expiry is instead handled differently by using a
human readable expiry date spelled out as "unlimited" instead of trying
to use a distant actual date.
Test 1660 and 1915 have been updated to help verify this change.
Reported-by: Jonathan Cardoso
Fixes #7720
Closes #7721
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/test1660 | 4 | ||||
| -rw-r--r-- | tests/data/test1915 | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/data/test1660 b/tests/data/test1660 index 3ddd8d427..cbbcf7587 100644 --- a/tests/data/test1660 +++ b/tests/data/test1660 @@ -20,6 +20,7 @@ HSTS # This file was generated by libcurl! Edit at your own risk. .readfrom.example "20211001 04:47:41" .old.example "20161001 04:47:41" +.new.example "unlimited" </file> # This date is exactly "20190124 22:34:21" UTC @@ -59,7 +60,7 @@ foo.example.com [example.com]: 1569905261 includeSubDomains 'forexample.net' is not HSTS 'example.net' is not HSTS expire.example [expire.example]: 1548369268 -Number of entries: 3 +Number of entries: 4 expire.example [expire.example]: 1548369268 expire.example [expire.example]: 1548369268 expire.example [expire.example]: 1548369268 @@ -74,6 +75,7 @@ expire.example [expire.example]: 1548369268 <file name="log/hsts%TESTNUMBER" mode="text"> # Your HSTS cache. https://curl.se/docs/hsts.html # This file was generated by libcurl! Edit at your own risk. +.new.example "unlimited" .example.com "20191001 04:47:41" example.org "20200124 22:34:21" </file> diff --git a/tests/data/test1915 b/tests/data/test1915 index 047a16e2e..d0b2862f9 100644 --- a/tests/data/test1915 +++ b/tests/data/test1915 @@ -42,9 +42,9 @@ http://%HOSTIP:%NOLISTENPORT/not-there/%TESTNUMBER </errorcode> <stdout> [0/4] 1.example.com 20370320 01:02:03 -[1/4] 2.example.com 20370320 01:02:03 -[2/4] 3.example.com 20370320 01:02:03 -[3/4] 4.example.com 20370320 01:02:03 +[1/4] 2.example.com 20370320 03:02:01 +[2/4] 3.example.com 20370319 01:02:03 +[3/4] 4.example.com unlimited </stdout> </verify> </testcase> |