Backing out bug 605296 due to potentially causing bug 615736. a=backout
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 01 Dec 2010 10:57:14 -0800
changeset 58449 4d01f72ce23c265111bc9d9612c32ff0dc837e01
parent 58448 d50f90723a3f4382a190d439cf29ae73029a3518
child 58450 ca55c84f43fd52d0c1ba7face219bef7061ad69c
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersbackout
bugs605296, 615736
milestone2.0b8pre
Backing out bug 605296 due to potentially causing bug 615736. a=backout
content/base/test/file_CrossSiteXHR_inner.html
content/base/test/test_CrossSiteXHR.html
--- a/content/base/test/file_CrossSiteXHR_inner.html
+++ b/content/base/test/file_CrossSiteXHR_inner.html
@@ -14,17 +14,16 @@ window.addEventListener("message", funct
 
   req = eval(e.data);
   var res = {
     didFail: false,
     events: [],
     progressEvents: 0,
     status: 0,
     responseText: "",
-    statusText: "",
     responseXML: null,
     sendThrew: false
   };
   
   var xhr = new XMLHttpRequest();
   for each(type in ["load", "abort", "error", "loadstart"]) {
     xhr.addEventListener(type, function(e) {
       res.events.push(e.type);
@@ -51,17 +50,16 @@ window.addEventListener("message", funct
   xhr.onload = xhr.onerror = function (event) {
     if (event.type == "error") {
       res.didFail = true;
     }
     res.status = xhr.status;
     try {
       res.statusText = xhr.statusText;
     } catch (e) {
-      delete(res.statusText);
     }
     res.responseXML = xhr.responseXML ?
       (new XMLSerializer()).serializeToString(xhr.responseXML) :
       null;
     res.responseText = xhr.responseText;
 
     res.responseHeaders = {};
     for (responseHeader in req.responseHeaders) {
--- a/content/base/test/test_CrossSiteXHR.html
+++ b/content/base/test/test_CrossSiteXHR.html
@@ -682,17 +682,17 @@ function runTest() {
           }
         }
       }
     }
     else {
       is(res.didFail, true,
         "should have failed in test for " + test.toSource());
       is(res.status, 0, "wrong status in test for " + test.toSource());
-      is(res.statusText, "", "wrong status text for " + test.toSource());
+      is(res.statusText, "", "wrong status in test for " + test.toSource());
       is(res.responseXML, null,
          "wrong responseXML in test for " + test.toSource());
       is(res.responseText, "",
          "wrong responseText in test for " + test.toSource());
       if (!res.sendThrew) {
         is(res.events.join(","),
            "opening,rs1,sending,rs1,loadstart,rs2,rs4,error",
            "wrong events in test for " + test.toSource());
@@ -824,17 +824,17 @@ function runTest() {
       is(res.events.join(","),
          "opening,rs1,sending,rs1,loadstart,rs2,rs3,rs4,load",
          "wrong responseText in test for " + test.toSource());
     }
     else {
       is(res.didFail, true,
         "should have failed in test for " + test.toSource());
       is(res.status, 0, "wrong status in test for " + test.toSource());
-      is(res.statusText, "", "wrong status text for " + test.toSource());
+      is(res.statusText, "", "wrong status in test for " + test.toSource());
       is(res.responseXML, null,
          "wrong responseXML in test for " + test.toSource());
       is(res.responseText, "",
          "wrong responseText in test for " + test.toSource());
       is(res.events.join(","),
          "opening,rs1,sending,rs1,loadstart,rs2,rs4,error",
          "wrong events in test for " + test.toSource());
       is(res.progressEvents, 0,
@@ -1093,17 +1093,17 @@ function runTest() {
       is(res.events.join(","),
          "opening,rs1,sending,rs1,loadstart,rs2,rs3,rs4,load",
          "wrong responseText in test for " + test.toSource());
     }
     else {
       is(res.didFail, true,
         "should have failed in test for " + test.toSource());
       is(res.status, 0, "wrong status in test for " + test.toSource());
-      is(res.statusText, "", "wrong status text for " + test.toSource());
+      is(res.statusText, "", "wrong status in test for " + test.toSource());
       is(res.responseXML, null,
          "wrong responseXML in test for " + test.toSource());
       is(res.responseText, "",
          "wrong responseText in test for " + test.toSource());
       is(res.events.join(","),
          "opening,rs1,sending,rs1,loadstart,rs2,rs4,error",
          "wrong events in test for " + test.toSource());
       is(res.progressEvents, 0,