Backed out changeset 11b27254f152 (bug 1352146) for leaks detected by Linux x64 asan. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 08 Apr 2017 01:45:28 +0200
changeset 351927 9204aed2836c9700fefe19463d0fbe8054be5266
parent 351926 b5c4d21732ce1901a055fe964fe91d83bf7378c3
child 351928 b8cfaab9ac095c31f92f0417c12d6119f5af7fbc
push id31623
push userarchaeopteryx@coole-files.de
push dateSat, 08 Apr 2017 20:46:02 +0000
treeherdermozilla-central@21c4aca1ae60 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1352146
milestone55.0a1
backs out11b27254f15229afc276141714a1d94557db5fd5
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 11b27254f152 (bug 1352146) for leaks detected by Linux x64 asan. r=backout on a CLOSED TREE
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');
   }