From f933449d3b6c24e66d4a0c590bca3e7b2a39140d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 6 Aug 2019 11:30:08 +0200 Subject: CURLINFO_RETRY_AFTER: parse the Retry-After header value This is only the libcurl part that provides the information. There's no user of the parsed value. This change includes three new tests for the parser. Ref: #3794 --- tests/data/Makefile.inc | 2 +- tests/data/test1594 | 52 ++++++++++++++++++++++++++++++++++++ tests/data/test1595 | 51 +++++++++++++++++++++++++++++++++++ tests/data/test1596 | 52 ++++++++++++++++++++++++++++++++++++ tests/libtest/Makefile.inc | 9 ++++++- tests/libtest/lib1594.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 230 insertions(+), 2 deletions(-) create mode 100644 tests/data/test1594 create mode 100644 tests/data/test1595 create mode 100644 tests/data/test1596 create mode 100644 tests/libtest/lib1594.c (limited to 'tests') diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 0657d2120..1e9aef9d2 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -178,7 +178,7 @@ test1540 test1541 \ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \ test1558 test1559 test1560 test1561 test1562 test1563 \ \ -test1590 test1591 test1592 test1593 \ +test1590 test1591 test1592 test1593 test1594 \ \ test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \ test1608 test1609 test1620 test1621 \ diff --git a/tests/data/test1594 b/tests/data/test1594 new file mode 100644 index 000000000..4907ca2be --- /dev/null +++ b/tests/data/test1594 @@ -0,0 +1,52 @@ + + + +HTTP +HTTP GET +HTTP replaced headers +CURLOPT_TIMECONDITION +If-Modified-Since + + + +# Server-side + + +HTTP/1.1 503 Error +Date: Thu, 11 Jul 2019 02:26:59 GMT +Server: test-server/swsclose +Retry-After: 22 + + + +# Client-side + + +http + + +HTTP Retry-After header parsing and extraction + + +lib1594 + + +http://%HOSTIP:%HTTPPORT/1594 + + + + + +^User-Agent:.* + + +GET /1594 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + + + +Retry-After: 22 + + + diff --git a/tests/data/test1595 b/tests/data/test1595 new file mode 100644 index 000000000..29b2b865f --- /dev/null +++ b/tests/data/test1595 @@ -0,0 +1,51 @@ + + + +HTTP +HTTP GET +HTTP replaced headers +CURLOPT_TIMECONDITION +If-Modified-Since + + + +# Server-side + + +HTTP/1.1 503 Error +Date: Thu, 11 Jul 2019 02:26:59 GMT +Server: test-server/swsclose + + + +# Client-side + + +http + + +HTTP Retry-After header extraction (without header) + + +lib1594 + + +http://%HOSTIP:%HTTPPORT/1595 + + + + + +^User-Agent:.* + + +GET /1595 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + + + +Retry-After: 0 + + + diff --git a/tests/data/test1596 b/tests/data/test1596 new file mode 100644 index 000000000..9a8cb480e --- /dev/null +++ b/tests/data/test1596 @@ -0,0 +1,52 @@ + + + +HTTP +HTTP GET +HTTP replaced headers +CURLOPT_TIMECONDITION +If-Modified-Since + + + +# Server-side + + +HTTP/1.1 503 Error +Date: Thu, 11 Jul 2019 02:26:59 GMT +Server: test-server/swsclose +Retry-After: Thu, 11 Jul 2024 02:26:59 GMT + + + +# Client-side + + +http + + +HTTP Retry-After header parsing using a date + + +lib1596 + + +http://%HOSTIP:%HTTPPORT/1596 + + + + + +^User-Agent:.* + + +GET /1596 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + + + +Retry-After: 172066 + + + diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index f5effd97d..4ea9cf2a7 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -32,7 +32,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1540 lib1541 \ lib1550 lib1551 lib1552 lib1553 lib1554 lib1555 lib1556 lib1557 \ lib1558 lib1559 lib1560 \ - lib1591 lib1592 lib1593 \ + lib1591 lib1592 lib1593 lib1594 lib1596 \ lib1900 lib1905 lib1906 \ lib2033 @@ -544,6 +544,13 @@ lib1592_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1592 lib1593_SOURCES = lib1593.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1593_LDADD = $(TESTUTIL_LIBS) +lib1594_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1594_LDADD = $(TESTUTIL_LIBS) + +lib1596_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1596_LDADD = $(TESTUTIL_LIBS) +lib1596_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1596 + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib1594.c b/tests/libtest/lib1594.c new file mode 100644 index 000000000..a76971590 --- /dev/null +++ b/tests/libtest/lib1594.c @@ -0,0 +1,66 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +/* Testing Retry-After header parser */ + +#include "test.h" + +#include "memdebug.h" + +int test(char *URL) +{ + struct curl_slist *header = NULL; + curl_off_t retry; + CURL *curl = NULL; + int res = 0; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) + goto test_cleanup; + + res = curl_easy_getinfo(curl, CURLINFO_RETRY_AFTER, &retry); + if(res) + goto test_cleanup; + +#ifdef LIB1596 + /* we get a relative number of seconds, so add the number of seconds + we're at to make it a somewhat stable number. Then remove accuracy. */ + retry += time(NULL); + retry /= 10000; +#endif + printf("Retry-After: %" CURL_FORMAT_CURL_OFF_T "\n", retry); + +test_cleanup: + + /* always cleanup */ + curl_easy_cleanup(curl); + curl_slist_free_all(header); + curl_global_cleanup(); + + return res; +} -- cgit v1.2.1