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,18 +4902,14 @@ 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
if (tp) {
nsresult response = NS_OK; nsresult response = NS_OK;
classifier->ClassifyLocal(principal, tp, &response); classifier->ClassifyLocal(principal, tp, &response);
if (NS_FAILED(response)) { if (NS_FAILED(response)) {
LOG(("nsHttpChannel::Found principal on local blocklist " LOG(("nsHttpChannel::Found principal on local blocklist [this=%p]", this));
"[this=%p]", this));
mLocalBlocklist = true; mLocalBlocklist = true;
} }
} }
} }
}
// If mTimingEnabled flag is not set after OnModifyRequest() then // If mTimingEnabled flag is not set after OnModifyRequest() then
// clear the already recorded AsyncOpen value for consistency. // clear the already recorded AsyncOpen value for consistency.