Merge m-c to inbound.

This commit is contained in:
Ryan VanderMeulen 2013-02-26 16:30:06 -05:00
commit dc2b0fee93

View File

@ -762,7 +762,16 @@ static bool ShouldReport()
// this environment variable prevents us from launching
// the crash reporter client
const char *envvar = PR_GetEnv("MOZ_CRASHREPORTER_NO_REPORT");
return !(envvar && *envvar);
if (envvar && *envvar) {
return false;
}
envvar = PR_GetEnv("MOZ_CRASHREPORTER_FULLDUMP");
if (envvar && *envvar) {
return false;
}
return true;
}
namespace {
@ -932,6 +941,11 @@ nsresult SetExceptionHandler(nsIFile* aXREDirectory,
}
}
}
const char* e = PR_GetEnv("MOZ_CRASHREPORTER_FULLDUMP");
if (e && *e) {
minidump_type = MiniDumpWithFullMemory;
}
#endif // XP_WIN32
#ifdef MOZ_WIDGET_ANDROID