summaryrefslogtreecommitdiff
path: root/methods/http.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-05-24 14:31:31 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2018-06-25 12:06:21 +0200
commitbf3162b5c61766bf535c2c735b00b1a0c3208605 (patch)
treeccaf055c9f16f07a2c82d30e7ed311d11a707332 /methods/http.cc
parent6101d018f07ebf103be7290b9e687625353644c0 (diff)
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)
Diffstat (limited to 'methods/http.cc')
-rw-r--r--methods/http.cc4
1 files changed, 2 insertions, 2 deletions
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;
}