Backing out the patch to bug 83536.
I will reland this when 1.6a re-opens. r+sr=jst@netscape.com a=chofmann git-svn-id: svn://10.0.0.236/trunk@244700 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
4d9d6b9a5d
commit
d0e02a5632
@ -43,7 +43,7 @@
|
||||
// XPConnect includes
|
||||
#include "nsIXPConnect.h"
|
||||
#include "nsIScriptSecurityManager.h"
|
||||
#include "nsIPrincipal.h"
|
||||
#include "nsICodebasePrincipal.h"
|
||||
|
||||
// XPCOM includes
|
||||
#include "nsIServiceManager.h"
|
||||
@ -813,7 +813,10 @@ nsSchemaLoader::GetResolvedURI(const nsAString& aSchemaURI,
|
||||
nsCOMPtr<nsIPrincipal> principal;
|
||||
rv = secMan->GetSubjectPrincipal(getter_AddRefs(principal));
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
principal->GetURI(getter_AddRefs(baseURI));
|
||||
nsCOMPtr<nsICodebasePrincipal> codebase = do_QueryInterface(principal);
|
||||
if (codebase) {
|
||||
codebase->GetURI(getter_AddRefs(baseURI));
|
||||
}
|
||||
}
|
||||
|
||||
rv = NS_NewURI(aURI, aSchemaURI, nsnull, baseURI);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user