summaryrefslogtreecommitdiff
path: root/src/convert_json.cpp
diff options
context:
space:
mode:
authorproller <proller@github.com>2013-07-27 17:44:59 +0400
committerproller <proller@github.com>2013-07-27 17:51:34 +0400
commite65d8ad6553d7ae0acf63b43e9818059088a00b6 (patch)
tree35b8cc38023a12f744f583fbcf5e313e67eec5b9 /src/convert_json.cpp
parent215e37aac3c0efb1a5b4a59bcd20a18632c59051 (diff)
downloadminetest-e65d8ad6553d7ae0acf63b43e9818059088a00b6.tar.gz
minetest-e65d8ad6553d7ae0acf63b43e9818059088a00b6.tar.bz2
minetest-e65d8ad6553d7ae0acf63b43e9818059088a00b6.zip
Dont announce server in singleplayer
Diffstat (limited to 'src/convert_json.cpp')
-rw-r--r--src/convert_json.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index 58eefd901..61db67fd5 100644
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -55,10 +55,11 @@ Json::Value fetchJsonValue(const std::string url,
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, g_settings->getS32("curl_timeout"));
+ curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, g_settings->getS32("curl_timeout"));
+
if (chunk != 0)
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
-
res = curl_easy_perform(curl);
if (res != CURLE_OK)
errorstream<<"Jsonreader: "<< url <<" not found (" << curl_easy_strerror(res) << ")" <<std::endl;