From 11f83c1e369d3028e53b307575691d9eaf82a32c Mon Sep 17 00:00:00 2001 From: spycrab Date: Fri, 4 May 2018 13:30:49 +0200 Subject: [PATCH] HttpRequest/Curl: Use a more intelligent timeout method --- Source/Core/Common/HttpRequest.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp index edb3286b19..ff8fa32c2e 100644 --- a/Source/Core/Common/HttpRequest.cpp +++ b/Source/Core/Common/HttpRequest.cpp @@ -108,7 +108,12 @@ HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms, ProgressCallback c // libcurl may not have been built with async DNS support, so we disable // signal handlers to avoid a possible and likely crash if a resolve times out. curl_easy_setopt(m_curl.get(), CURLOPT_NOSIGNAL, true); - curl_easy_setopt(m_curl.get(), CURLOPT_TIMEOUT_MS, static_cast(timeout_ms.count())); + curl_easy_setopt(m_curl.get(), CURLOPT_CONNECTTIMEOUT_MS, static_cast(timeout_ms.count())); + // Sadly CURLOPT_LOW_SPEED_TIME doesn't have a millisecond variant so we have to use seconds + curl_easy_setopt( + m_curl.get(), CURLOPT_LOW_SPEED_TIME, + static_cast(std::chrono::duration_cast(timeout_ms).count())); + curl_easy_setopt(m_curl.get(), CURLOPT_LOW_SPEED_LIMIT, 1); #ifdef _WIN32 // ALPN support is enabled by default but requires Windows >= 8.1. curl_easy_setopt(m_curl.get(), CURLOPT_SSL_ENABLE_ALPN, false);