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 .
This commit is contained in:
David Major 2015-10-06 10:58:50 -04:00 committed by Ted Mielczarek
parent dbf56c53a0
commit 7685dfc567
9 changed files with 63 additions and 58 deletions

View file

@ -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,
"",

View file

@ -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,
"",

View file

@ -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;