diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-04 00:05:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-04 00:05:04 +0100 |
| commit | cb1dfa9ec09af2abf6d10e4bf2764476db83841b (patch) | |
| tree | 5ccd5fd123fa07702b6cf647cedb7df8e8917fa0 /src/lib/internet.cc | |
| parent | dc120d521c740b7f1ec356538139c5769a5f54be (diff) | |
| parent | 4092121ad052f406e8b5c5a2debbd8256321f182 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/internet.cc')
| -rw-r--r-- | src/lib/internet.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/internet.cc b/src/lib/internet.cc index c28e650fd..1c61e96e3 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -56,6 +56,8 @@ get_from_zip_url (string url, string file, function<void (boost::filesystem::pat curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_zip_url_data); curl_easy_setopt (curl, CURLOPT_WRITEDATA, f); curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0); + /* Maximum time is 20s */ + curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20); CURLcode const cr = curl_easy_perform (curl); @@ -117,6 +119,8 @@ ftp_ls (string url) url += "/"; } curl_easy_setopt (curl, CURLOPT_URL, url.c_str ()); + /* 20s timeout */ + curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20); string ls_raw; struct curl_slist* commands = 0; |