From fbc8b983d5645e5a0ed807b29c2ce8e2b88cccef Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 21 Feb 2017 13:38:50 -0500 Subject: [PATCH] Windows: Support crash upload URLs with query component (issue #1995) --- patch/patch.cfg | 3 +++ patch/patches/crashpad_tp_1995.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/patch/patch.cfg b/patch/patch.cfg index 2801cd01c..7f854b692 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -300,6 +300,9 @@ patches = [ # # Implement better rate-limiting/retry logic. # https://bugs.chromium.org/p/crashpad/issues/detail?id=23 + # + # Windows: Support crash upload URLs with query component. + # https://bugs.chromium.org/p/crashpad/issues/detail?id=163 'name': 'crashpad_tp_1995', 'path': '../third_party/crashpad/', }, diff --git a/patch/patches/crashpad_tp_1995.patch b/patch/patches/crashpad_tp_1995.patch index 70f1130af..742b9d7ad 100644 --- a/patch/patches/crashpad_tp_1995.patch +++ b/patch/patches/crashpad_tp_1995.patch @@ -288,3 +288,16 @@ index 3ada8c3..ffaae42 100644 prune_thread.Start(); CrashReportExceptionHandler exception_handler( +diff --git crashpad/util/net/http_transport_win.cc crashpad/util/net/http_transport_win.cc +index 58ecc47..8c1c16d 100644 +--- crashpad/util/net/http_transport_win.cc ++++ crashpad/util/net/http_transport_win.cc +@@ -143,7 +143,7 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) { + ScopedHINTERNET request(WinHttpOpenRequest( + connect.get(), + base::UTF8ToUTF16(method()).c_str(), +- url_path.c_str(), ++ (url_path + extra_info).c_str(), + nullptr, + WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES,