Backed out changeset fbe9ba3b1e9a (bug 1122691) for m5 orange

This commit is contained in:
Wes Kocher 2015-01-21 16:48:57 -08:00
parent 8025281b09
commit cd757b2e7f

View File

@ -4902,15 +4902,11 @@ nsHttpChannel::BeginConnect()
nsCOMPtr<nsIPrincipal> principal = GetPrincipal(false); nsCOMPtr<nsIPrincipal> principal = GetPrincipal(false);
bool tp = false; bool tp = false;
channelClassifier->ShouldEnableTrackingProtection(this, &tp); channelClassifier->ShouldEnableTrackingProtection(this, &tp);
// See bug 1122691 nsresult response = NS_OK;
if (tp) { classifier->ClassifyLocal(principal, tp, &response);
nsresult response = NS_OK; if (NS_FAILED(response)) {
classifier->ClassifyLocal(principal, tp, &response); LOG(("nsHttpChannel::Found principal on local blocklist [this=%p]", this));
if (NS_FAILED(response)) { mLocalBlocklist = true;
LOG(("nsHttpChannel::Found principal on local blocklist "
"[this=%p]", this));
mLocalBlocklist = true;
}
} }
} }
} }