corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset d46155cc719e (bug 1305567) for various failures in browser-chrome, devtools, and xpcshell (e.g. test_streamupdater.js) tests. r=backout on a CLOSED TREE

Browse Source
This commit is contained in:
Sebastian Hengst
2016-09-29 20:54:50 +02:00
parent e696858b7d
commit 4ad6c96678
6 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp
View File

@@ -35,8 +35,6 @@ const uint32_t MAX_FILE_SIZE = (32 * 1024 * 1024);
// MOZ_LOG=UrlClassifierStreamUpdater:5
static mozilla::LazyLogModule gUrlClassifierStreamUpdaterLog("UrlClassifierStreamUpdater");
#define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierStreamUpdaterLog, mozilla::LogLevel::Debug)
#define LOG(args) TrimAndLog args
// Calls nsIURLFormatter::TrimSensitiveURLs to remove sensitive
@@ -680,13 +678,7 @@ nsUrlClassifierStreamUpdater::OnStartRequest(nsIRequest *request,
}
mDownloadError = true;
status = NS_ERROR_ABORT;
if (LOG_ENABLED()) {
// We can't return an error just yet because we need to read the body
// in order to see the error message.
status = NS_OK;
}
} else if (NS_SUCCEEDED(status)) {
MOZ_ASSERT(mDownloadErrorCallback);
mBeganStream = true;
@@ -707,9 +699,8 @@ nsUrlClassifierStreamUpdater::OnDataAvailable(nsIRequest *request,
uint64_t aSourceOffset,
uint32_t aLength)
{
if (!mDBService && !mDownloadError) {
if (!mDBService)
return NS_ERROR_NOT_INITIALIZED;
}
LOG(("OnDataAvailable (%d bytes)", aLength));
@@ -725,11 +716,6 @@ nsUrlClassifierStreamUpdater::OnDataAvailable(nsIRequest *request,
rv = NS_ConsumeStream(aIStream, aLength, chunk);
NS_ENSURE_SUCCESS(rv, rv);
if (mDownloadError) {
mDownloadErrorMessage.Append(chunk);
return NS_OK;
}
//LOG(("Chunk (%d): %s\n\n", chunk.Length(), chunk.get()));
rv = mDBService->UpdateStream(chunk);
NS_ENSURE_SUCCESS(rv, rv);
@@ -741,11 +727,6 @@ NS_IMETHODIMP
nsUrlClassifierStreamUpdater::OnStopRequest(nsIRequest *request, nsISupports* context,
nsresult aStatus)
{
if (mDownloadError) {
LOG(("Download error message: %s", mDownloadErrorMessage.get()));
return NS_ERROR_ABORT; // The value doesn't matter.
}
if (!mDBService)
return NS_ERROR_NOT_INITIALIZED;