diff --git a/browser/base/content/pageinfo/permissions.js b/browser/base/content/pageinfo/permissions.js index 55a67a99365b..c997fdc2b4d1 100644 --- a/browser/base/content/pageinfo/permissions.js +++ b/browser/base/content/pageinfo/permissions.js @@ -30,7 +30,7 @@ var permissionObserver = { function onLoadPermission() { - var uri = gDocument.documentURIObject; + var uri = BrowserUtils.makeURIFromCPOW(gDocument.documentURIObject); var permTab = document.getElementById("permTab"); if (SitePermissions.isSupportedURI(uri)) { gPermURI = uri; diff --git a/browser/base/content/pageinfo/security.js b/browser/base/content/pageinfo/security.js index e2c16300a4ac..f3f166b62934 100644 --- a/browser/base/content/pageinfo/security.js +++ b/browser/base/content/pageinfo/security.js @@ -3,6 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +Components.utils.import("resource://gre/modules/BrowserUtils.jsm"); + var security = { // Display the server certificate (static) viewCert : function () { @@ -135,7 +137,7 @@ var security = { getService(Components.interfaces.nsIEffectiveTLDService); var eTLD; - var uri = gDocument.documentURIObject; + var uri = BrowserUtils.makeURIFromCPOW(gDocument.documentURIObject); try { eTLD = eTLDService.getBaseDomain(uri); } @@ -232,7 +234,7 @@ function securityOnLoad() { var yesStr = pageInfoBundle.getString("yes"); var noStr = pageInfoBundle.getString("no"); - var uri = gDocument.documentURIObject; + var uri = BrowserUtils.makeURIFromCPOW(gDocument.documentURIObject); setText("security-privacy-cookies-value", hostHasCookies(uri) ? yesStr : noStr); setText("security-privacy-passwords-value", diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 2ebf011c4b9d..e6a2923c3d1e 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -174,7 +174,6 @@ skip-if = buildapp == 'mulet' || e10s # Bug 1099156 - test directly manipulates skip-if = buildapp == 'mulet' [browser_bug455852.js] [browser_bug460146.js] -skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s [browser_bug462289.js] skip-if = toolkit == "cocoa" || e10s # Bug 1102017 - middle-button mousedown on selected tab2 does not activate tab - Didn't expect [object XULElement], but got it [browser_bug462673.js] @@ -187,7 +186,6 @@ skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet' [browser_bug495058.js] [browser_bug517902.js] -skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s [browser_bug519216.js] [browser_bug520538.js] [browser_bug521216.js] @@ -335,7 +333,7 @@ skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing unc skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null [browser_overflowScroll.js] [browser_pageInfo.js] -skip-if = buildapp == 'mulet' || e10s # Bug 866413 - PageInfo doesn't work in e10s +skip-if = buildapp == 'mulet' [browser_page_style_menu.js] [browser_parsable_css.js] diff --git a/browser/base/content/test/plugins/browser.ini b/browser/base/content/test/plugins/browser.ini index b28dec5edfff..e043681f6a73 100644 --- a/browser/base/content/test/plugins/browser.ini +++ b/browser/base/content/test/plugins/browser.ini @@ -79,7 +79,6 @@ skip-if = !crashreporter [browser_pluginCrashCommentAndURL.js] skip-if = !crashreporter [browser_pageInfo_plugins.js] -skip-if = e10s # Bug 866413 [browser_pluginplaypreview.js] skip-if = e10s # bug 1148827 [browser_pluginplaypreview2.js] diff --git a/browser/modules/Feeds.jsm b/browser/modules/Feeds.jsm index f3977ee5ee1c..e9fcedf44cfb 100644 --- a/browser/modules/Feeds.jsm +++ b/browser/modules/Feeds.jsm @@ -7,6 +7,7 @@ this.EXPORTED_SYMBOLS = [ "Feeds" ]; Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); +Components.utils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"); @@ -37,8 +38,11 @@ this.Feeds = { } if (aIsFeed) { + // re-create the principal as it may be a CPOW. + let principalURI = BrowserUtils.makeURIFromCPOW(aPrincipal.URI); + let principalToCheck = Services.scriptSecurityManager.getNoAppCodebasePrincipal(principalURI); try { - BrowserUtils.urlSecurityCheck(aLink.href, aPrincipal, + BrowserUtils.urlSecurityCheck(aLink.href, principalToCheck, Ci.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL); return type || "application/rss+xml"; }