From 0390c42a7fc648a116ac3fd0417eac92dfe79f6d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 2 Sep 2014 22:57:44 +0100
Subject: Add a reasonably low timeout to curl fetches.

---
 src/lib/internet.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib/internet.cc')

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;
-- 
cgit v1.2.3