Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sapier 2014-06-15 21:30:44 +02:00
parent 24face5249
commit 13517fb726
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minetest.conf.example
View File

@ -212,6 +212,8 @@
# - Downloads performed by main menu (e.g. mod manager) # - Downloads performed by main menu (e.g. mod manager)
# Only has an effect if compiled with cURL # Only has an effect if compiled with cURL
#curl_parallel_limit = 8 #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 usage of remote media server (if provided by server)
#enable_remote_media_server = true #enable_remote_media_server = true

1
src/defaultsettings.cpp
View File

@ -153,6 +153,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("curl_timeout", "5000"); settings->setDefault("curl_timeout", "5000");
settings->setDefault("curl_parallel_limit", "8"); settings->setDefault("curl_parallel_limit", "8");
settings->setDefault("curl_file_download_timeout", "300000");
settings->setDefault("enable_remote_media_server", "true"); settings->setDefault("enable_remote_media_server", "true");

1
src/guiEngine.cpp
View File

@ -523,6 +523,7 @@ bool GUIEngine::downloadFile(std::string url,std::string target)
HTTPFetchResult fetchresult; HTTPFetchResult fetchresult;
fetchrequest.url = url; fetchrequest.url = url;
fetchrequest.caller = HTTPFETCH_SYNC; fetchrequest.caller = HTTPFETCH_SYNC;
fetchrequest.timeout = g_settings->getS32("curl_file_download_timeout");
httpfetch_sync(fetchrequest, fetchresult); httpfetch_sync(fetchrequest, fetchresult);
if (fetchresult.succeeded) { if (fetchresult.succeeded) {