diff --git a/common/HTTPDownloaderWinHTTP.cpp b/common/HTTPDownloaderWinHTTP.cpp index b07e5f876e..3dbde710ee 100644 --- a/common/HTTPDownloaderWinHTTP.cpp +++ b/common/HTTPDownloaderWinHTTP.cpp @@ -56,6 +56,11 @@ bool HTTPDownloaderWinHttp::Initialize(std::string user_agent) return false; } + DWORD timeout_ms = 15000; + WinHttpSetOption(m_hSession, WINHTTP_OPTION_CONNECT_TIMEOUT, &timeout_ms, sizeof(timeout_ms)); + WinHttpSetOption(m_hSession, WINHTTP_OPTION_SEND_TIMEOUT, &timeout_ms, sizeof(timeout_ms)); + WinHttpSetOption(m_hSession, WINHTTP_OPTION_RECEIVE_TIMEOUT, &timeout_ms, sizeof(timeout_ms)); + return true; } @@ -290,10 +295,13 @@ bool HTTPDownloaderWinHttp::StartRequest(HTTPDownloader::Request* request) req->status_code = HTTP_STATUS_ERROR; req->state.store(Request::State::Complete); } + else + { + DevCon.WriteLn("Started HTTP request for '%s'", req->url.c_str()); + req->state = Request::State::Started; + req->start_time = Common::Timer::GetCurrentValue(); + } - DevCon.WriteLn("Started HTTP request for '%s'", req->url.c_str()); - req->state = Request::State::Started; - req->start_time = Common::Timer::GetCurrentValue(); return true; } diff --git a/pcsx2/Achievements.cpp b/pcsx2/Achievements.cpp index 0e7f74a823..ff672d2341 100644 --- a/pcsx2/Achievements.cpp +++ b/pcsx2/Achievements.cpp @@ -745,11 +745,18 @@ void Achievements::ClientServerCall( { HTTPDownloader::Request::Callback hd_callback = [callback, callback_data](s32 status_code, const std::string& content_type, HTTPDownloader::Request::Data data) { + const bool is_error = (status_code <= 0); + const bool is_retryable = + is_error && (status_code == HTTPDownloader::HTTP_STATUS_TIMEOUT); + rc_api_server_response_t rr; - rr.http_status_code = (status_code <= 0) ? (status_code == HTTPDownloader::HTTP_STATUS_CANCELLED ? - RC_API_SERVER_RESPONSE_CLIENT_ERROR : - RC_API_SERVER_RESPONSE_RETRYABLE_CLIENT_ERROR) - : status_code; + rr.http_status_code = + is_error + ? (is_retryable + ? RC_API_SERVER_RESPONSE_RETRYABLE_CLIENT_ERROR + : RC_API_SERVER_RESPONSE_CLIENT_ERROR) + : status_code; + rr.body_length = data.size(); rr.body = reinterpret_cast(data.data());