From 091056692685779a9f4c87f1ec9884fa4804b708 Mon Sep 17 00:00:00 2001
From: hackademix
Date: Thu, 19 Jul 2018 00:31:34 +0200
Subject: Removed useless work-around suggested in moz bug 1410755 which caused
 Tor Browser content process crashes.

---
 src/bg/RequestUtil.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src/bg')

diff --git a/src/bg/RequestUtil.js b/src/bg/RequestUtil.js
index 234ca4a..5a52975 100644
--- a/src/bg/RequestUtil.js
+++ b/src/bg/RequestUtil.js
@@ -1,10 +1,8 @@
 'use strict';
 {
-  let NULL = new Uint8Array();
-
   let xmlFeedOrImage = /^(?:(?:application|text)\/(?:(?:r(?:ss|df)|atom)\+)xml(;|$))|image\//i;
   let rawXml = /^(?:application|text)\/xml;/i;
-  let brokenOnLoad;
+  let brokenXMLOnLoad;
 
   let pendingRequests = new Map();
 
@@ -83,12 +81,12 @@
       }
 
       if (xmlFeedOrImage.test(content.type) && !/\/svg\b/i.test(content.type)) return;
-      if (typeof brokenOnLoad === "undefined") {
-        brokenOnLoad = await (async () => parseInt((await browser.runtime.getBrowserInfo()).version) < 61)();
+      if (typeof brokenXMLOnLoad === "undefined") {
+        brokenXMLOnLoad = await (async () => parseInt((await browser.runtime.getBrowserInfo()).version) < 61)();
       }
 
-      let mustCheckFeed = brokenOnLoad && frameId === 0 && rawXml.test(content.type);
-      debug("mustCheckFeed = %s, brokenOnLoad = %s", mustCheckFeed, brokenOnLoad);
+      let mustCheckFeed = brokenXMLOnLoad && frameId === 0 && rawXml.test(content.type);
+      debug("mustCheckFeed = %s, brokenXMLOnLoad = %s", mustCheckFeed, brokenXMLOnLoad);
       let filter = browser.webRequest.filterResponseData(requestId);
       let buffer = [];
       let first = true;
@@ -114,13 +112,6 @@
         }
       };
 
-      if (brokenOnLoad) {
-        filter.onstart = event => {
-          filter.write(NULL);
-          debug("onstart", url);
-        }
-      }
-
       filter.ondata = event => {
         if (first) {
           runAndFlush();
-- 
cgit v1.2.3