Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out the patch to bug 83536.

Browse Source 
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@146256 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
caillon%returnzero.com
2003-08-22 03:06:53 +00:00
parent 509ac04c4a
commit d55b44719f
66 changed files with 2991 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/modules/libjar/nsJARChannel.cpp
View File

@@ -22,11 +22,12 @@
#include "nsMimeTypes.h"
#include "nsNetUtil.h"
#include "nsIScriptSecurityManager.h"
#include "nsIPrincipal.h"
#include "nsScriptSecurityManager.h"
#include "nsIAggregatePrincipal.h"
#include "nsIFileURL.h"
#include "nsIJAR.h"
static NS_DEFINE_CID(kScriptSecurityManagerCID, NS_SCRIPTSECURITYMANAGER_CID);
static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
//-----------------------------------------------------------------------------
@@ -423,28 +424,22 @@ nsJARChannel::GetOwner(nsISupports **result)
if (cert) {
// Get the codebase principal
nsCOMPtr<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
do_GetService(kScriptSecurityManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrincipal> codebase;
rv = secMan->GetCodebasePrincipal(mJarBaseURI,
getter_AddRefs(codebase));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIURI> codebaseURI;
codebase->GetURI(getter_AddRefs(codebaseURI));
nsCOMPtr<nsIURI> domainURI;
codebase->GetDomain(getter_AddRefs(domainURI));
// Join the certificate and the codebase
rv = cert->SetURI(codebaseURI);
nsCOMPtr<nsIAggregatePrincipal> agg = do_QueryInterface(cert, &rv);
if (NS_FAILED(rv)) return rv;
rv = cert->SetDomain(domainURI);
rv = agg->SetCodebase(codebase);
if (NS_FAILED(rv)) return rv;
mOwner = do_QueryInterface(cert, &rv);
mOwner = do_QueryInterface(agg, &rv);
if (NS_FAILED(rv)) return rv;
NS_ADDREF(*result = mOwner);