Bug 673588 - use correct location when resolving CSP sources and report-uris, r=dveditz
authorBrandon Sterne <bsterne@mozilla.com>
Fri, 22 Jul 2011 16:14:58 -0700
changeset 73230 887fad3ebc0bed499c158c1824cd7e47c4779cc7
parent 73229 c7985dc6737f79e9ff48535ca23f874325ac033a
child 73231 0f00661af740c47d12017a3fd355d55e771f73f8
push id20832
push userbsterne@mozilla.com
push dateFri, 22 Jul 2011 23:15:29 +0000
treeherdermozilla-central@887fad3ebc0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdveditz
bugs673588
milestone8.0a1
first release with
nightly linux32
887fad3ebc0b / 8.0a1 / 20110723030814 / files
nightly linux64
887fad3ebc0b / 8.0a1 / 20110723030814 / files
nightly mac
887fad3ebc0b / 8.0a1 / 20110723030814 / files
nightly win32
887fad3ebc0b / 8.0a1 / 20110723030814 / files
nightly win64
887fad3ebc0b / 8.0a1 / 20110723030814 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 673588 - use correct location when resolving CSP sources and report-uris, r=dveditz
content/base/src/CSPUtils.jsm
--- a/content/base/src/CSPUtils.jsm
+++ b/content/base/src/CSPUtils.jsm
@@ -121,17 +121,17 @@ function CSPdebug(aMsg) {
 // Callback to resume a request once the policy-uri has been fetched
 function CSPPolicyURIListener(policyURI, docRequest, csp) {
   this._policyURI = policyURI;    // location of remote policy
   this._docRequest = docRequest;  // the parent document request
   this._csp = csp;                // parent document's CSP
   this._policy = "";              // contents fetched from policyURI
   this._wrapper = null;           // nsIScriptableInputStream
   this._docURI = docRequest.QueryInterface(Components.interfaces.nsIChannel)
-                 .originalURI;    // parent document URI (to be used as 'self')
+                 .URI;    // parent document URI (to be used as 'self')
 }
 
 CSPPolicyURIListener.prototype = {
 
   QueryInterface: function(iid) {
     if (iid.equals(Components.interfaces.nsIStreamListener) ||
         iid.equals(Components.interfaces.nsIRequestObserver) ||
         iid.equals(Components.interfaces.nsISupports))