From 77f1a70332f003277e521644fccf741ef141ec70 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Thu, 16 Apr 2020 11:11:15 -0700 Subject: [PATCH] browser(firefox): send requestFailed on network error (#1816) --- browser_patches/firefox/BUILD_NUMBER | 2 +- browser_patches/firefox/patches/bootstrap.diff | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index 6d5177e445af0..15f05f40fecf8 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1 +1 @@ -1082 +1083 diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff index db1d40c6b4148..40a507decfda3 100644 --- a/browser_patches/firefox/patches/bootstrap.diff +++ b/browser_patches/firefox/patches/bootstrap.diff @@ -1400,10 +1400,10 @@ index 0000000000000000000000000000000000000000..b8e6649fb91be6cd72b000426fb4d582 + diff --git a/juggler/NetworkObserver.js b/juggler/NetworkObserver.js new file mode 100644 -index 0000000000000000000000000000000000000000..b8a98b058ea36f85fddfa21e992e2d0674c11e3d +index 0000000000000000000000000000000000000000..1a55b5498c18d2403eab21fe9149242f286157d4 --- /dev/null +++ b/juggler/NetworkObserver.js -@@ -0,0 +1,789 @@ +@@ -0,0 +1,794 @@ +"use strict"; + +const {EventEmitter} = ChromeUtils.import('resource://gre/modules/EventEmitter.jsm'); @@ -2024,9 +2024,14 @@ index 0000000000000000000000000000000000000000..b8a98b058ea36f85fddfa21e992e2d06 + if (this._disposed) + return; + -+ const body = this._chunks.join(''); ++ if (aStatusCode === 0) { ++ const body = this._chunks.join(''); ++ this._networkObserver._onResponseFinished(this._pageNetwork, this._httpChannel, body); ++ } else { ++ this._networkObserver._sendOnRequestFailed(this._pageNetwork, this._httpChannel, aStatusCode); ++ } ++ + delete this._chunks; -+ this._networkObserver._onResponseFinished(this._pageNetwork, this._httpChannel, body); + this.dispose(); + } +