+++ This bug was initially created as a clone of Bug #776402 +++ Bug 774585 changed the way that GetCodebasePrincipal works (see https://bugzilla.mozilla.org/show_bug.cgi?id=774585#c0). Thunderbird uses GetCodebasePrincipal in 3 locations: /mail/components/newmailaccount/content/accountProvisioner.js line 46 -- var principal = ssm.getCodebasePrincipal(uri); /mail/components/aboutRedirector.js line 54 -- let principal = secMan.getCodebasePrincipal(aURI); /mail/test/mozmill/newmailaccount/test-newmailaccount.js line 1205 -- let principal = ssm.getCodebasePrincipal(uri); These need to be updated to fix Account Provisioner and our About Redirector. Cc'ing some SeaMonkey people, because I think suite is affected too.

This is to fix the session store bustage only.

Comment on attachment 647104 [details] [diff] [review] Session Store bustage fix only I think _serializeSessionStorage also needs to be fixed. e.g. var principal = SecMan.getCodebasePrincipal(uri); should be updated to use getDocShellCodebasePrincipal()

Comment on attachment 653081 [details] [diff] [review] Proposed patch >+ let principal = SecMan.getAppCodebasePrincipal(uri, aDocShell); Oops, I accidentally copied from the wrong patch by mistake; this should say getDocShellCodebasePrincipal.

Comment on attachment 653081 [details] [diff] [review] Proposed patch Review of attachment 653081 [details] [diff] [review]: ----------------------------------------------------------------- ::: suite/feeds/src/FeedWriter.js @@ +1106,5 @@ > this._handlersMenuList = this._getUIElement("handlersMenuList"); > > var secman = Components.classes["@mozilla.org/scriptsecuritymanager;1"] > .getService(Components.interfaces.nsIScriptSecurityManager); > + this._feedPrincipal = secman.getSimpleCodebasePrincipal(this._feedURI); Ftr, this line is copied from http://hg.mozilla.org/mozilla-central/rev/2328647c5d6d from bug 774585 ;-)

Comment on attachment 653081 [details] [diff] [review] Proposed patch Looks OK from code inspection. Since with this patch session restore seems to be working with no problems including sites that require local storage I'm giving this a rs=me

Pushed comm-central changeset 185acd65afd6.