From b16b89c89dc2292e66d025148d1b4cd4a94a526b Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Fri, 6 Feb 2015 10:10:55 -0800 Subject: [PATCH] Make HTTPTransportWin respect user timeout Uses solution suggested in linked bug. No test as it'd be flaky, slow, or both. R=mark@chromium.org BUG=crashpad:8 Review URL: https://codereview.chromium.org/897393002 --- util/net/http_transport_win.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/util/net/http_transport_win.cc b/util/net/http_transport_win.cc index 99f87ba2..2fe89deb 100644 --- a/util/net/http_transport_win.cc +++ b/util/net/http_transport_win.cc @@ -97,6 +97,16 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) { return false; } + int timeout_in_ms = static_cast(timeout() * 1000); + if (!WinHttpSetTimeouts(session.get(), + timeout_in_ms, + timeout_in_ms, + timeout_in_ms, + timeout_in_ms)) { + LogErrorWinHttpMessage("WinHttpSetTimeouts"); + return false; + } + URL_COMPONENTS url_components = {0}; url_components.dwStructSize = sizeof(URL_COMPONENTS); url_components.dwHostNameLength = 1;