Bug 1352146 - fix whitespace in moz-http2.js. r=mcmanus
authorNicholas Hurley <hurley@mozilla.com>
Fri, 07 Apr 2017 12:58:54 -0700
changeset 352230 5b1879a044bc882e3d579166581316edc61f2af4
parent 352229 7f9114ffbcae47f2870f542d62bb95dd6a0166aa
child 352231 409b7edf344aca8712630dd9c75062afc46fc56b
push id31634
push usercbook@mozilla.com
push dateTue, 11 Apr 2017 08:14:14 +0000
treeherdermozilla-central@596ea55fa962 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1352146
milestone55.0a1
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
Bug 1352146 - fix whitespace in moz-http2.js. r=mcmanus MozReview-Commit-ID: Ij4c6RS0UyV
testing/xpcshell/moz-http2/moz-http2.js
--- a/testing/xpcshell/moz-http2/moz-http2.js
+++ b/testing/xpcshell/moz-http2/moz-http2.js
@@ -501,19 +501,19 @@ function handleRequest(req, res) {
 
   else if (u.pathname === "/altsvc1") {
     if (req.httpVersionMajor != 2 ||
       req.scheme != "http" ||
       req.headers['alt-used'] != ("foo.example.com:" + serverPort)) {
       res.writeHead(400);
       res.end("WHAT?");
       return;
-   }
-   // test the alt svc frame for use with altsvc2
-   res.altsvc("foo.example.com", serverPort, "h2", 3600, req.headers['x-redirect-origin']);
+    }
+    // test the alt svc frame for use with altsvc2
+    res.altsvc("foo.example.com", serverPort, "h2", 3600, req.headers['x-redirect-origin']);
   }
 
   else if (u.pathname === "/altsvc2") {
     if (req.httpVersionMajor != 2 ||
       req.scheme != "http" ||
       req.headers['alt-used'] != ("foo.example.com:" + serverPort)) {
       res.writeHead(400);
       res.end("WHAT?");
@@ -724,39 +724,39 @@ function handleRequest(req, res) {
     // Overwrite the original transform with our version that will insert an
     // empty DATA frame at the beginning of the stream response, then fall
     // through to the default response behavior.
     Serializer.prototype._transform = newTransform;
   }
 
   // for use with test_immutable.js
   else if (u.pathname === "/immutable-test-without-attribute") {
-     res.setHeader('Cache-Control', 'max-age=100000');
-     res.setHeader('Etag', '1');
-     if (req.headers["if-none-match"]) {
-       res.setHeader("x-conditional", "true");
-     }
+    res.setHeader('Cache-Control', 'max-age=100000');
+    res.setHeader('Etag', '1');
+    if (req.headers["if-none-match"]) {
+      res.setHeader("x-conditional", "true");
+    }
     // default response from here
   }
   else if (u.pathname === "/immutable-test-with-attribute") {
     res.setHeader('Cache-Control', 'max-age=100000, immutable');
     res.setHeader('Etag', '2');
-     if (req.headers["if-none-match"]) {
-       res.setHeader("x-conditional", "true");
-     }
-   // default response from here
+    if (req.headers["if-none-match"]) {
+      res.setHeader("x-conditional", "true");
+    }
+    // default response from here
   }
   else if (u.pathname === "/origin-4") {
    var originList = [ ];
    req.stream.connection.originFrame(originList);
    res.setHeader("x-client-port", req.remotePort);
   }
   else if (u.pathname === "/origin-6") {
    var originList = [ "https://alt1.example.com:" + serverPort,
-		      "https://alt2.example.com:" + serverPort,
+                      "https://alt2.example.com:" + serverPort,
                       "https://bar.example.com:" + serverPort ];
    req.stream.connection.originFrame(originList);
    res.setHeader("x-client-port", req.remotePort);
   }
   else if (u.pathname === "/origin-11-a") {
     res.setHeader("x-client-port", req.remotePort);
 
     pushb = res.push(
@@ -789,17 +789,17 @@ function handleRequest(req, res) {
     pushe = res.push(
         { hostname: 'alt1.example.com:' + serverPort, port: serverPort, path : '/origin-11-e', method : 'GET',
           headers: {'x-pushed-request': 'true', 'x-foo' : 'bar'}});
     pushe.writeHead(200, {
       'pushed' : 'yes',
       'content-length' : 1
       });
     pushe.end('1');
-}
+  }
   else if (u.pathname.substring(0,8) === "/origin-") { // test_origin.js coalescing
     res.setHeader("x-client-port", req.remotePort);
   }
 
   res.setHeader('Content-Type', 'text/html');
   if (req.httpVersionMajor != 2) {
     res.setHeader('Connection', 'close');
   }