diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp index c539fc7f80..da489ef18d 100644 --- a/Source/Core/Common/HttpRequest.cpp +++ b/Source/Core/Common/HttpRequest.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "Common/Logging/Log.h" #include "Common/ScopeGuard.h" @@ -30,9 +31,14 @@ public: size_t size); private: - std::unique_ptr m_curl{curl_easy_init(), curl_easy_cleanup}; + static std::mutex s_curl_was_inited_mutex; + static bool s_curl_was_inited; + std::unique_ptr m_curl{nullptr, curl_easy_cleanup}; }; +std::mutex HttpRequest::Impl::s_curl_was_inited_mutex; +bool HttpRequest::Impl::s_curl_was_inited = false; + HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms) : m_impl(std::make_unique(timeout_ms)) { @@ -65,6 +71,16 @@ HttpRequest::Response HttpRequest::Post(const std::string& url, const std::strin HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms) { + { + std::lock_guard lk(s_curl_was_inited_mutex); + if (!s_curl_was_inited) + { + curl_global_init(CURL_GLOBAL_DEFAULT); + s_curl_was_inited = true; + } + } + + m_curl.reset(curl_easy_init()); if (!m_curl) return;