1.1 --- a/config/global/download.in Fri May 09 19:07:02 2014 -0700
1.2 +++ b/config/global/download.in Sat May 10 12:33:37 2014 +0200
1.3 @@ -30,8 +30,7 @@
1.4 prompt "Connection timeout"
1.5 default 10
1.6 help
1.7 - From the curl manual:
1.8 - Maximum time in seconds that you allow the connection to the server to take.
1.9 + Maximum time in seconds that you allow the connection to the server to take.
1.10
1.11 The scenario is as follows;
1.12 - some enterprise networks have firewalls that prohibit FTP traffic, while
1.13 @@ -45,9 +44,7 @@
1.14 10s. If you know a firewall is blocking connections, but your network is globally
1.15 fast, you can try to lower this value to jump more quickly to allowed URLs. YMMV.
1.16
1.17 - Note that this value applies equally to wget if you have that installed.
1.18 -
1.19 - If '-1' is specified, no timeout reconfiguration options are passed to wget/curl.
1.20 + If '-1' is specified, no timeout reconfiguration options are passed to wget.
1.21
1.22 config ONLY_DOWNLOAD
1.23 bool
2.1 --- a/scripts/functions Fri May 09 19:07:02 2014 -0700
2.2 +++ b/scripts/functions Sat May 10 12:33:37 2014 +0200
2.3 @@ -571,7 +571,6 @@
2.4 # Some company networks have firewalls to connect to the internet, but it's
2.5 # not easy to detect them, so force a global ${CT_CONNECT_TIMEOUT}-second
2.6 # timeout.
2.7 - # For curl, no good progress indicator is available. So, be silent.
2.8 if [ ${CT_CONNECT_TIMEOUT} = -1 ]; then
2.9 T=
2.10 else