Follow on patch to fix oranges from changeset 8ce70abd7777

This commit is contained in:
Joel Maher 2010-03-08 20:41:00 -08:00
Родитель daab44389b
Коммит 93847954ff
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -15,13 +15,13 @@ function handleRequest(request, response)
var xhr = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Components.interfaces.nsIXMLHttpRequest);
//serve the main page with a CSP header!
// -- anything served from 'self' (localhost:8888) will be allowed,
// -- anything served from 'self' (mochi.test:8888) will be allowed,
// -- anything served from other hosts (example.com:80) will be blocked.
// -- XHR tests are set up in the file_CSP_main.js file which is sourced.
response.setHeader("X-Content-Security-Policy",
"allow 'self'",
false);
xhr.open("GET", "http://localhost:8888/tests/content/base/test/file_CSP_evalscript_main.html", false);
xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_CSP_evalscript_main.html", false);
xhr.send(null);
if(xhr.status == 200) {
response.write(xhr.responseText);

Просмотреть файл

@ -6,8 +6,8 @@ function test() {
waitForExplicitFinish();
var pagetitle = "Page Title for Bug 503832";
var pageurl = "http://localhost:8888/browser/docshell/test/browser/file_bug503832.html";
var fragmenturl = "http://localhost:8888/browser/docshell/test/browser/file_bug503832.html#firefox";
var pageurl = "http://mochi.test:8888/browser/docshell/test/browser/file_bug503832.html";
var fragmenturl = "http://mochi.test:8888/browser/docshell/test/browser/file_bug503832.html#firefox";
/* Global history observer that triggers for the two test URLs above. */
var historyObserver = {