Merge remote branch 'origin/master'

[minetest.git] / src / serverlist.cpp

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index b2f49ae72191f6ec1f390748c6bb2a06f107882b..d37b5d6371fed45689699d5384e83c601913eef8 100644 (file)
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -84,6 +84,7 @@ std::vector<ServerListSpec> getOnline()
        {
                CURLcode res;
 
+               curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
                curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+"/list").c_str());
                curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::WriteCallback);
                curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);