Compare commits
5 Commits
7f1c2b8a00
...
426bdba7fb
Author | SHA1 | Date |
---|---|---|
sfan5 | 426bdba7fb | |
Paramat | c0fb5dd317 | |
paramat | 77cfc4fcd1 | |
Wuzzy | 9f1b98b997 | |
ANAND | d50feb89de |
|
@ -23,7 +23,7 @@ end)
|
||||||
|
|
||||||
function core.after(after, func, ...)
|
function core.after(after, func, ...)
|
||||||
assert(tonumber(after) and type(func) == "function",
|
assert(tonumber(after) and type(func) == "function",
|
||||||
"Invalid core.after invocation")
|
"Invalid minetest.after invocation")
|
||||||
jobs[#jobs + 1] = {
|
jobs[#jobs + 1] = {
|
||||||
func = func,
|
func = func,
|
||||||
expire = time + after,
|
expire = time + after,
|
||||||
|
|
|
@ -1918,7 +1918,7 @@ emergequeue_limit_generate (Limit of emerge queues to generate) int 64
|
||||||
# WARNING: Currently there are multiple bugs that may cause crashes when
|
# WARNING: Currently there are multiple bugs that may cause crashes when
|
||||||
# 'num_emerge_threads' is larger than 1. Until this warning is removed it is
|
# 'num_emerge_threads' is larger than 1. Until this warning is removed it is
|
||||||
# strongly recommended this value is set to the default '1'.
|
# strongly recommended this value is set to the default '1'.
|
||||||
# Empty or 0 value:
|
# Value 0:
|
||||||
# - Automatic selection. The number of emerge threads will be
|
# - Automatic selection. The number of emerge threads will be
|
||||||
# - 'number of processors - 2', with a lower limit of 1.
|
# - 'number of processors - 2', with a lower limit of 1.
|
||||||
# Any other value:
|
# Any other value:
|
||||||
|
|
|
@ -2997,7 +2997,7 @@
|
||||||
# WARNING: Currently there are multiple bugs that may cause crashes when
|
# WARNING: Currently there are multiple bugs that may cause crashes when
|
||||||
# 'num_emerge_threads' is larger than 1. Until this warning is removed it is
|
# 'num_emerge_threads' is larger than 1. Until this warning is removed it is
|
||||||
# strongly recommended this value is set to the default '1'.
|
# strongly recommended this value is set to the default '1'.
|
||||||
# Empty or 0 value:
|
# Value 0:
|
||||||
# - Automatic selection. The number of emerge threads will be
|
# - Automatic selection. The number of emerge threads will be
|
||||||
# - 'number of processors - 2', with a lower limit of 1.
|
# - 'number of processors - 2', with a lower limit of 1.
|
||||||
# Any other value:
|
# Any other value:
|
||||||
|
|
|
@ -128,10 +128,10 @@ EmergeManager::EmergeManager(Server *server)
|
||||||
|
|
||||||
enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
|
enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
|
||||||
|
|
||||||
// If unspecified, leave a proc for the main thread and one for
|
s16 nthreads = 1;
|
||||||
// some other misc thread
|
|
||||||
s16 nthreads;
|
|
||||||
g_settings->getS16NoEx("num_emerge_threads", nthreads);
|
g_settings->getS16NoEx("num_emerge_threads", nthreads);
|
||||||
|
// If automatic, leave a proc for the main thread and one for
|
||||||
|
// some other misc thread
|
||||||
if (nthreads == 0)
|
if (nthreads == 0)
|
||||||
nthreads = Thread::getNumberOfProcessors() - 2;
|
nthreads = Thread::getNumberOfProcessors() - 2;
|
||||||
if (nthreads < 1)
|
if (nthreads < 1)
|
||||||
|
|
|
@ -2425,7 +2425,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int layer,
|
||||||
if (tooltip_text.empty())
|
if (tooltip_text.empty())
|
||||||
tooltip_text = utf8_to_wide(item.name);
|
tooltip_text = utf8_to_wide(item.name);
|
||||||
else if (m_tooltip_append_itemname)
|
else if (m_tooltip_append_itemname)
|
||||||
tooltip_text += utf8_to_wide(" [" + item.name + "]");
|
tooltip_text += utf8_to_wide("\n[" + item.name + "]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!tooltip_text.empty()) {
|
if (!tooltip_text.empty()) {
|
||||||
|
|
|
@ -253,6 +253,10 @@ HTTPFetchOngoing::HTTPFetchOngoing(const HTTPFetchRequest &request_,
|
||||||
curl_easy_setopt(curl, CURLOPT_INTERFACE, bind_address.c_str());
|
curl_easy_setopt(curl, CURLOPT_INTERFACE, bind_address.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!g_settings->getBool("enable_ipv6")) {
|
||||||
|
curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
|
||||||
|
}
|
||||||
|
|
||||||
#if LIBCURL_VERSION_NUM >= 0x071304
|
#if LIBCURL_VERSION_NUM >= 0x071304
|
||||||
// Restrict protocols so that curl vulnerabilities in
|
// Restrict protocols so that curl vulnerabilities in
|
||||||
// other protocols don't affect us.
|
// other protocols don't affect us.
|
||||||
|
|
Loading…
Reference in New Issue