diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-05-24 13:54:27 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-05-24 13:54:27 +0000 |
| commit | 9b0319db37c97cfb2a018b6af97019efba4562ab (patch) | |
| tree | 4dd7778d05b65b30f5c9d0c5d8dc142f7d9926ba /methods/http.cc | |
| parent | 6eaeec549241677335813af78f394010e5b3eefb (diff) | |
| parent | 329a4a6159f1972ff5ec7bc2db26430f26dc61f3 (diff) | |
Merge branch 'pu/timeout-bad-addr-fixes' into 'master'
Pu/timeout bad addr fixes
See merge request apt-team/apt!18
Diffstat (limited to 'methods/http.cc')
| -rw-r--r-- | methods/http.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/methods/http.cc b/methods/http.cc index 4514c3d60..3862497a8 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -496,7 +496,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; } @@ -536,7 +536,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; } |