diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2018-05-24 14:31:31 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2018-06-25 12:06:21 +0200 |
| commit | bf3162b5c61766bf535c2c735b00b1a0c3208605 (patch) | |
| tree | ccaf055c9f16f07a2c82d30e7ed311d11a707332 | |
| parent | 6101d018f07ebf103be7290b9e687625353644c0 (diff) | |
| download | apt-bf3162b5c61766bf535c2c735b00b1a0c3208605.tar.gz | |
Lower default timeout from 120s to 30s
120s is an insanely high default time out, lower it to 30s
to make things a bit nicer.
(cherry picked from commit 329a4a6159f1972ff5ec7bc2db26430f26dc61f3)
| -rw-r--r-- | doc/examples/configure-index | 6 | ||||
| -rw-r--r-- | methods/basehttp.cc | 2 | ||||
| -rw-r--r-- | methods/ftp.cc | 2 | ||||
| -rw-r--r-- | methods/http.cc | 4 | ||||
| -rw-r--r-- | methods/rsh.cc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 4612f362e..71ec57be0 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -259,7 +259,7 @@ Acquire { Proxy "http://127.0.0.1:3128"; Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting - Timeout "120"; + Timeout "30"; ConnectionAttemptDelayMsec "250"; Pipeline-Depth "5"; AllowRedirect "true"; @@ -285,7 +285,7 @@ Acquire Verify-Host "true"; AllowRedirect "true"; - Timeout "120"; + Timeout "30"; ConnectionAttemptDelayMsec "250"; AllowRedirect "true"; @@ -313,7 +313,7 @@ Acquire "PASS $(SITE_PASS)"; }; - Timeout "120"; + Timeout "30"; ConnectionAttemptDelayMsec "250"; /* Passive mode control, proxy, non-proxy and per-host. Pasv mode diff --git a/methods/basehttp.cc b/methods/basehttp.cc index 2473ecb5c..91e71b5d4 100644 --- a/methods/basehttp.cc +++ b/methods/basehttp.cc @@ -250,7 +250,7 @@ bool RequestState::HeaderLine(string const &Line) /*{{{*/ /*}}}*/ // ServerState::ServerState - Constructor /*{{{*/ ServerState::ServerState(URI Srv, BaseHttpMethod *Owner) : - ServerName(Srv), TimeOut(120), Owner(Owner) + ServerName(Srv), TimeOut(30), Owner(Owner) { Reset(); } diff --git a/methods/ftp.cc b/methods/ftp.cc index 2daba8ffe..fefe3cfbb 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -63,7 +63,7 @@ struct AFMap AFMap[] = {{AF_INET,1},{0, 0}}; struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{0, 0}}; #endif -unsigned long TimeOut = 120; +unsigned long TimeOut = 30; URI Proxy; string FtpMethod::FailFile; int FtpMethod::FailFd = -1; diff --git a/methods/http.cc b/methods/http.cc index 5d286bcb4..fcff3dd7d 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -497,7 +497,7 @@ ResultState HttpServerState::Open() return result; result = UnwrapSocks(ServerName.Host, ServerName.Port == 0 ? DefaultPort : ServerName.Port, - Proxy, ServerFd, Owner->ConfigFindI("TimeOut", 120), Owner); + Proxy, ServerFd, Owner->ConfigFindI("TimeOut", 30), Owner); if (result != ResultState::SUCCESSFUL) return result; } @@ -537,7 +537,7 @@ ResultState HttpServerState::Open() } if (Host == Proxy.Host && tls) { - result = UnwrapHTTPConnect(ServerName.Host, ServerName.Port == 0 ? DefaultPort : ServerName.Port, Proxy, ServerFd, Owner->ConfigFindI("TimeOut", 120), Owner); + result = UnwrapHTTPConnect(ServerName.Host, ServerName.Port == 0 ? DefaultPort : ServerName.Port, Proxy, ServerFd, Owner->ConfigFindI("TimeOut", 30), Owner); if (result != ResultState::SUCCESSFUL) return result; } diff --git a/methods/rsh.cc b/methods/rsh.cc index 69a51a13d..31cbb3bcd 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -33,7 +33,7 @@ #include <apti18n.h> /*}}}*/ -unsigned long TimeOut = 120; +unsigned long TimeOut = 30; Configuration::Item const *RshOptions = 0; time_t RSHMethod::FailTime = 0; std::string RSHMethod::FailFile; |