Fixes #43262 [1] 504 Gateway Timeout responses will now be dealt like other non-fatal errors.
Added a test case for the same [1]: https://savannah.gnu.org/bugs/?43262 -- Thanking You, Darshit Shah
From e5d5c0b23d85b9e1853b18a1cb7384f66ba8cf50 Mon Sep 17 00:00:00 2001 From: Darshit Shah <[email protected]> Date: Wed, 19 Nov 2014 14:08:08 +0530 Subject: [PATCH] Make 504 Gateway Timeout non fatal --- src/ChangeLog | 9 ++++++- src/exits.c | 2 +- src/http.c | 21 +++++++++++++++- src/wget.h | 2 +- testenv/ChangeLog | 8 +++++- testenv/Makefile.am | 1 + testenv/Test-504.py | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 110 insertions(+), 5 deletions(-) create mode 100755 testenv/Test-504.py diff --git a/src/ChangeLog b/src/ChangeLog index 4e974b0..4ce75a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-11-19 Darshit Shah <[email protected]> + + * exits.c (get_status_for_err): GATEWAYTIMEOUT is a Server Error and Wget's + exit code should reflect that + * wget.h: Add GATEWAYTIMEOUT as an error + * http.c (http_loop): Gateway timeout errors should be non-fatal + 2014-11-18 Tim Ruehsen <[email protected]> * Fix warnings from clang-analyzer 3.6 @@ -12,7 +19,7 @@ 2014-11-17 Tim Ruehsen <[email protected]> * http.c: use c_strncasecmp() in BEGINS_WITH macro - and in STARTS macro + and in STARTS macro 2014-11-17 Tim Ruehsen <[email protected]> diff --git a/src/exits.c b/src/exits.c index 31e6a6e..1daf442 100644 --- a/src/exits.c +++ b/src/exits.c @@ -56,7 +56,7 @@ get_status_for_err (uerr_t err) case FTPNSFOD: case FTPUNKNOWNTYPE: case FTPSRVERR: case FTPRETRINT: case FTPRESTFAIL: case FTPNOPASV: case CONTNOTSUPPORTED: case RANGEERR: case RETRBADPATTERN: - case PROXERR: + case PROXERR: case GATEWAYTIMEOUT: return WGET_EXIT_SERVER_ERROR; case URLERROR: case QUOTEXC: case SSLINITFAILED: case UNKNOWNATTR: default: diff --git a/src/http.c b/src/http.c index dd9d7e4..06148eb 100644 --- a/src/http.c +++ b/src/http.c @@ -130,6 +130,7 @@ static struct cookie_jar *wget_cookie_jar; #define HTTP_STATUS_NOT_IMPLEMENTED 501 #define HTTP_STATUS_BAD_GATEWAY 502 #define HTTP_STATUS_UNAVAILABLE 503 +#define HTTP_STATUS_GATEWAY_TIMEOUT 504 enum rp { rel_none, rel_name, rel_value, rel_both @@ -2461,6 +2462,24 @@ read_header: pconn.authorized = true; } + if (statcode == HTTP_STATUS_GATEWAY_TIMEOUT) + { + hs->len = 0; + hs->res = 0; + hs->restval = 0; + + CLOSE_FINISH (sock); + request_free (req); + xfree (hs->message); + hs->message = NULL; + xfree_null (message); + resp_free (resp); + xfree (head); + + return GATEWAYTIMEOUT; + } + + /* Determine the local filename if needed. Notice that if -O is used * hstat.local_file is set by http_loop to the argument of -O. */ if (!hs->local_file) @@ -3184,7 +3203,7 @@ Spider mode enabled. Check if remote file exists.\n")); { case HERR: case HEOF: case CONSOCKERR: case CONERROR: case READERR: case WRITEFAILED: - case RANGEERR: case FOPEN_EXCL_ERR: + case RANGEERR: case FOPEN_EXCL_ERR: case GATEWAYTIMEOUT: /* Non-fatal errors continue executing the loop, which will bring them to "while" statement at the end, to judge whether the number of tries was exceeded. */ diff --git a/src/wget.h b/src/wget.h index 34b8c0c..53f9011 100644 --- a/src/wget.h +++ b/src/wget.h @@ -337,7 +337,7 @@ typedef enum FTPOK, FTPLOGINC, FTPLOGREFUSED, FTPPORTERR, FTPSYSERR, FTPNSFOD, FTPUNKNOWNTYPE, FTPRERR, FTPSRVERR, FTPRETRINT, FTPRESTFAIL, URLERROR, FOPENERR, - FOPEN_EXCL_ERR, FWRITEERR, HEOF, + FOPEN_EXCL_ERR, FWRITEERR, HEOF, GATEWAYTIMEOUT, HERR, RETROK, RECLEVELEXC, WRONGCODE, FTPINVPASV, FTPNOPASV, CONTNOTSUPPORTED, RETRUNNEEDED, RETRFINISHED, READERR, TRYLIMEXC, FILEBADFILE, RANGEERR, diff --git a/testenv/ChangeLog b/testenv/ChangeLog index f230ac6..814a374 100644 --- a/testenv/ChangeLog +++ b/testenv/ChangeLog @@ -1,7 +1,13 @@ +2014-11-19 Darshit Shah <[email protected]> + + * Test-504.py: Add new test case to show how Wget handles 504 Gateway + Timeouts + * Makefile.am: Add Test-504.py to TESTS + 2014-11-17 Tim Ruehsen <[email protected]> * server/http/http_server.py: allow case-insensitive auth-type, - send BasIc and DIgest to provoke Wget failures with turkish locales + send BasIc and DIgest to provoke Wget failures with turkish locales 2014-11-15 Darshit Shah <[email protected]> diff --git a/testenv/Makefile.am b/testenv/Makefile.am index 59dbbf5..8574ad9 100644 --- a/testenv/Makefile.am +++ b/testenv/Makefile.am @@ -50,6 +50,7 @@ if HAVE_PYTHON3 Test--https-crl.py \ Test-O.py \ Test-Post.py \ + Test-504.py \ Test--spider-r.py XFAIL_TESTS = Test-auth-both.py diff --git a/testenv/Test-504.py b/testenv/Test-504.py new file mode 100755 index 0000000..4d82704 --- /dev/null +++ b/testenv/Test-504.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 +from sys import exit +from test.http_test import HTTPTest +from misc.wget_file import WgetFile + +""" + This test ensures that Wget handles a 504 Gateway Timeout response + correctly. + Since, we do not have a direct mechanism for conditionally sending responses + via the HTTP Server, I've used a workaround. + The server will always respond to a request for File1 with a 504 Gateway + Timeout. Using the --tries=2 option, we ensure that Wget attempts the file + only twice and then move on to the next file. Finally, check the exact + requests that the Server received and compare them, in order, to the + expected sequence of requests. + + In this case, we expect Wget to attempt File1 twice and File2 once. If Wget + considered 504 as a general Server Error, it would be a fatal failure and + Wget would request File1 only once. +""" +TEST_NAME = "504 Gateway Timeouts" +############# File Definitions ############################################### +File1 = """All happy families are alike; +Each unhappy family is unhappy in its own way""" +File2 = "Anyone for chocochip cookies?" + +File1_rules = { + "Response" : 504 +} + +A_File = WgetFile ("File1", File1, rules=File1_rules) +B_File = WgetFile ("File2", File2) + +Request_List = [ + [ + "GET /File1", + "GET /File1", + "GET /File2", + ] +] + + +WGET_OPTIONS = "--tries=2" +WGET_URLS = [["File1", "File2"]] + +Files = [[A_File, B_File]] + +ExpectedReturnCode = 4 +ExpectedDownloadedFiles = [B_File] + +################ Pre and Post Test Hooks ##################################### +pre_test = { + "ServerFiles" : Files +} +test_options = { + "WgetCommands" : WGET_OPTIONS, + "Urls" : WGET_URLS +} +post_test = { + "ExpectedFiles" : ExpectedDownloadedFiles, + "ExpectedRetcode" : ExpectedReturnCode, + "FilesCrawled" : Request_List +} + +err = HTTPTest ( + name=TEST_NAME, + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test +).begin () + +exit (err) -- 2.1.3
pgphP3mR8xdBU.pgp
Description: PGP signature
