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/ftp.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/ftp.cc')
-rw-r--r-- | methods/ftp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index ebe555a04..8213f1b50 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -62,7 +62,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; |