From fb936930bc694df4e5d1fb067ccd2f8f93ee62a5 Mon Sep 17 00:00:00 2001 From: "dcamp%mozilla.com" Date: Sat, 1 Sep 2007 00:48:30 +0000 Subject: [PATCH] only malware check nsHttpChannel for now, should fix orange. b=384941, r+sr=biesi git-svn-id: svn://10.0.0.236/trunk@233529 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 74faa69bc18..0a166bfc34b 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -9102,25 +9102,12 @@ nsClassifierCallback::Run() nsresult rv = channel->GetURI(getter_AddRefs(uri)); NS_ENSURE_SUCCESS(rv, rv); - // Don't bother checking certain types of URIs. - PRBool hasFlags; - rv = NS_URIChainHasFlags(uri, - nsIProtocolHandler::URI_DANGEROUS_TO_LOAD, - &hasFlags); - NS_ENSURE_SUCCESS(rv, rv); - if (hasFlags) return NS_OK; - - rv = NS_URIChainHasFlags(uri, - nsIProtocolHandler::URI_IS_LOCAL_FILE, - &hasFlags); - NS_ENSURE_SUCCESS(rv, rv); - if (hasFlags) return NS_OK; - - rv = NS_URIChainHasFlags(uri, - nsIProtocolHandler::URI_IS_UI_RESOURCE, - &hasFlags); - NS_ENSURE_SUCCESS(rv, rv); - if (hasFlags) return NS_OK; + // XXX: we need to audit other channels to make sure they can handle + // being suspended directly after AsyncOpen() + nsCOMPtr httpChannel = do_QueryInterface(channel); + if (!httpChannel) { + return NS_OK; + } nsCOMPtr uriClassifier = do_GetService(NS_URICLASSIFIERSERVICE_CONTRACTID, &rv);