diff options
| author | David Major <dmajor@mozilla.com> | 2015-10-06 10:58:50 -0400 |
|---|---|---|
| committer | Ted Mielczarek <ted@mielczarek.org> | 2015-10-06 11:05:12 -0400 |
| commit | 7685dfc567dc45e523864a0e9177d003e1b46276 (patch) | |
| tree | e0699555089d2d2be98abc35b6071ac1c7bdc559 /src/tools | |
| parent | Fix MSVC build (including on 2015), drop some workarounds for MSVC older than... (diff) | |
| download | breakpad-7685dfc567dc45e523864a0e9177d003e1b46276.tar.xz | |
Support for multiple upload files in CrashReportSender/HTTPUpload
A=David Major <dmajor@mozilla.com>
BUG=https://bugzilla.mozilla.org/show_bug.cgi?id=1048091
R=ted@mielczarek.org
Review URL: https://bugzilla.mozilla.org/show_bug.cgi?id=1048091 .
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/linux/symupload/minidump_upload.cc | 6 | ||||
| -rw-r--r-- | src/tools/linux/symupload/sym_upload.cc | 7 | ||||
| -rw-r--r-- | src/tools/windows/symupload/symupload.cc | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/tools/linux/symupload/minidump_upload.cc b/src/tools/linux/symupload/minidump_upload.cc index 94c3492c..19f17450 100644 --- a/src/tools/linux/symupload/minidump_upload.cc +++ b/src/tools/linux/symupload/minidump_upload.cc @@ -62,12 +62,14 @@ static void Start(Options *options) { parameters["prod"] = options->product; parameters["ver"] = options->version; + std::map<string, string> files; + files["upload_file_minidump"] = options->minidumpPath; + // Send it string response, error; bool success = HTTPUpload::SendRequest(options->uploadURLStr, parameters, - options->minidumpPath, - "upload_file_minidump", + files, options->proxy, options->proxy_user_pwd, "", diff --git a/src/tools/linux/symupload/sym_upload.cc b/src/tools/linux/symupload/sym_upload.cc index 82a8230b..2f9a73c3 100644 --- a/src/tools/linux/symupload/sym_upload.cc +++ b/src/tools/linux/symupload/sym_upload.cc @@ -139,12 +139,15 @@ static void Start(Options *options) { parameters["debug_file"] = module_parts[4]; parameters["code_file"] = module_parts[4]; parameters["debug_identifier"] = compacted_id; + + std::map<string, string> files; + files["symbol_file"] = options->symbolsPath; + string response, error; long response_code; bool success = HTTPUpload::SendRequest(options->uploadURLStr, parameters, - options->symbolsPath, - "symbol_file", + files, options->proxy, options->proxy_user_pwd, "", diff --git a/src/tools/windows/symupload/symupload.cc b/src/tools/windows/symupload/symupload.cc index df4bb693..fa5294de 100644 --- a/src/tools/windows/symupload/symupload.cc +++ b/src/tools/windows/symupload/symupload.cc @@ -228,12 +228,14 @@ int wmain(int argc, wchar_t *argv[]) { fwprintf(stderr, L"Warning: Could not get file version for %s\n", module); } + map<wstring, wstring> files; + files[L"symbol_file"] = symbol_file; + bool success = true; while (currentarg < argc) { int response_code; - if (!HTTPUpload::SendRequest(argv[currentarg], parameters, - symbol_file, L"symbol_file", + if (!HTTPUpload::SendRequest(argv[currentarg], parameters, files, timeout == -1 ? NULL : &timeout, nullptr, &response_code)) { success = false; |