Add separate download timeout to allow download of bigger files or on low bandwidth...

diff --git a/minetest.conf.example b/minetest.conf.example
index a8d573d82d6e3295331badd20191c6da57ff0fce..5c4be79f380a47205ed543e4aa52ddebe2e44877 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -212,6 +212,8 @@
 # - Downloads performed by main menu (e.g. mod manager)
 # Only has an effect if compiled with cURL
 #curl_parallel_limit = 8
+# maximum time in ms a file download (e.g. a mod download) may take
+#curl_file_download_timeout = 300000
 
 # enable usage of remote media server (if provided by server)
 #enable_remote_media_server = true

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index cc6a0dd69164f91d9de422bac43afe4b6ec7076a..cf9101e34c8ecfa02d14d2e859be078e9482e557 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -153,6 +153,7 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
+       settings->setDefault("curl_file_download_timeout", "300000");
 
        settings->setDefault("enable_remote_media_server", "true");
 

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 34bdaffad23ee6e6e6a2723a9bf5a8c4c45b50fb..5307332164bef4a4e62c9781d22b6c121abc7482 100644 (file)
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -523,6 +523,7 @@ bool GUIEngine::downloadFile(std::string url,std::string target)
        HTTPFetchResult fetchresult;
        fetchrequest.url = url;
        fetchrequest.caller = HTTPFETCH_SYNC;
+       fetchrequest.timeout = g_settings->getS32("curl_file_download_timeout");
        httpfetch_sync(fetchrequest, fetchresult);
 
        if (fetchresult.succeeded) {