From 4a556240b9be581aa70cc37ed6d1824cf010dc83 Mon Sep 17 00:00:00 2001 From: "blizzard%redhat.com" Date: Thu, 20 Apr 2006 03:37:20 +0000 Subject: [PATCH] Back out mstoltz because of blocker bug #81629. Original bugs were 47905 79775. git-svn-id: svn://10.0.0.236/trunk@194789 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsXMLHttpRequest.cpp | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp index db949c17472..40c8e6b86c1 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -922,26 +922,10 @@ nsXMLHttpRequest::Open(const char *method, const char *url) NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - - nsCOMPtr targetURI; - rv = NS_NewURI(getter_AddRefs(targetURI), url, nsnull); - if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - - rv = secMan->CheckConnect(cx, targetURI, "XMLHttpRequest","open"); - if (NS_FAILED(rv)) - { - // Security check failed. The above call set a JS exception. The - // following lines ensure that the exception is propagated. - - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); - nsCOMPtr cc; - if(NS_SUCCEEDED(rv)) - xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); - if (cc) - cc->SetExceptionWasThrown(PR_TRUE); - return NS_OK; - } - + /* + rv = secMan->CheckScriptAccessToURL(cx, url, NS_DOM_PROP_XMLHTTPREQUEST_OPEN, PR_FALSE); + if (NS_FAILED(rv)) return NS_ERROR_FAILURE; + */ nsCOMPtr principal; rv = secMan->GetSubjectPrincipal(getter_AddRefs(principal)); if (NS_SUCCEEDED(rv)) {