Backed out changeset 9f3adfd2ca52 (bug 815299) for M4 bustage.
authorNigel Babu <nigelbabu@gmail.com>
Wed, 09 Sep 2015 09:12:24 +0530
changeset 294072 2f2051c912c1bf68c5b613d005b80d594dee4fa8
parent 294071 5b5da1602564a09e58e96074065e5daf9414171b
child 294073 0f5defda5bf27fee6344f2a7847a892df192038e
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs815299
milestone43.0a1
backs out9f3adfd2ca520a8f87ad58602f4241b179c86584
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9f3adfd2ca52 (bug 815299) for M4 bustage.
dom/workers/test/serviceworkers/fetch/fetch_tests.js
dom/workers/test/xhr_headers_server.sjs
--- a/dom/workers/test/serviceworkers/fetch/fetch_tests.js
+++ b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
@@ -329,12 +329,9 @@ fetch(new Request('body-blob', {method: 
 
 expectAsyncResult();
 fetch(new Request('empty-header', {headers:{"emptyheader":""}}))
 .then(function(res) {
   return res.text();
 }).then(function(body) {
   my_ok(body == "emptyheader", "The empty header was observed in the fetch event");
   finish();
-}, function(err) {
-  my_ok(false, "A promise was rejected with " + err);
-  finish();
 });
--- a/dom/workers/test/xhr_headers_server.sjs
+++ b/dom/workers/test/xhr_headers_server.sjs
@@ -6,36 +6,29 @@
 
 function handleRequest(request, response) {
   switch (request.method) {
     case "POST":
       try {
         var optionsHost = request.getHeader("options-host");
       } catch(e) { }
 
-      bool headerFound = false;
       if (optionsHost) {
         setState("postHost", request.host);
         setState("optionsHost", optionsHost);
-        headerFound = true;
       }
 
       try {
         var emptyHeader = "nada" + request.getHeader("empty");
       } catch(e) { }
 
       if (emptyHeader && emptyHeader == "nada") {
         setState("emptyHeader", "nada");
-        headerFound = true;
       }
-      if (headerFound) {
-        return;
-      } else {
-        break;
-      }
+      return;
 
     case "OPTIONS":
       if (getState("optionsHost") == request.host) {
         try {
           var optionsHeader =
             request.getHeader("Access-Control-Request-Headers");
         } catch(e) { }
         setState("optionsHeader", "'" + optionsHeader + "'");