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

Don't allow sync. HTTP requests on the main thread anymore

Browse Source 
Any sync. HTTP request on the main thread is a bug, don't allow introducing one again.
This commit is contained in:
Gregor Parzefall 2024-05-13 20:02:34 +02:00 committed by grorp
parent c3efcb3896
commit d733e1abea
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/httpfetch.cpp
View File

@ -749,19 +749,6 @@ static void httpfetch_request_clear(u64 caller)
} }
} }
static void httpfetch_sync(const HTTPFetchRequest &fetch_request,
HTTPFetchResult &fetch_result)
{
// Create ongoing fetch data and make a cURL handle
// Set cURL options based on HTTPFetchRequest
CurlHandlePool pool;
HTTPFetchOngoing ongoing(fetch_request, &pool);
// Do the fetch (curl_easy_perform)
CURLcode res = ongoing.start(nullptr);
// Update fetch result
fetch_result = *ongoing.complete(res);
}
bool httpfetch_sync_interruptible(const HTTPFetchRequest &fetch_request, bool httpfetch_sync_interruptible(const HTTPFetchRequest &fetch_request,
HTTPFetchResult &fetch_result, long interval) HTTPFetchResult &fetch_result, long interval)
{ {
@ -779,7 +766,8 @@ bool httpfetch_sync_interruptible(const HTTPFetchRequest &fetch_request,
} while (!httpfetch_async_get(req.caller, fetch_result)); } while (!httpfetch_async_get(req.caller, fetch_result));
httpfetch_caller_free(req.caller); httpfetch_caller_free(req.caller);
} else { } else {
httpfetch_sync(fetch_request, fetch_result); throw ModError(std::string("You have tried to execute a synchronous HTTP request on the main thread! "
"This offense shall be punished. (").append(fetch_request.url).append(")"));
} }
return true; return true;
} }