From 96b0a4b99313719922b78fecd1e9bb0211f7ffd9 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 18 Mar 2022 18:30:28 -0700 Subject: [PATCH] browser(firefox): fast post body conversion to base64 (#12898) --- browser_patches/firefox-beta/BUILD_NUMBER | 4 ++-- .../firefox-beta/juggler/NetworkObserver.js | 11 +++-------- browser_patches/firefox/BUILD_NUMBER | 4 ++-- browser_patches/firefox/juggler/NetworkObserver.js | 11 +++-------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER index 637edfbd36..8936316764 100644 --- a/browser_patches/firefox-beta/BUILD_NUMBER +++ b/browser_patches/firefox-beta/BUILD_NUMBER @@ -1,2 +1,2 @@ -1318 -Changed: lushnikov@chromium.org Mon 28 Feb 2022 06:54:27 PM PST +1319 +Changed: yurys@chromium.org Fri 18 Mar 2022 05:39:20 PM PDT diff --git a/browser_patches/firefox-beta/juggler/NetworkObserver.js b/browser_patches/firefox-beta/juggler/NetworkObserver.js index f7e7659f8d..a800f1e342 100644 --- a/browser_patches/firefox-beta/juggler/NetworkObserver.js +++ b/browser_patches/firefox-beta/juggler/NetworkObserver.js @@ -754,16 +754,11 @@ function readRequestPostData(httpChannel) { } // Read data from the stream. - let result = undefined; + let result = ''; try { - const buffer = NetUtil.readInputStream(iStream, iStream.available()); - const bytes = new Uint8Array(buffer); - let binary = ''; - for (let i = 0; i < bytes.byteLength; i++) - binary += String.fromCharCode(bytes[i]); - result = btoa(binary); + const buffer = NetUtil.readInputStreamToString(iStream, iStream.available()); + result = btoa(buffer); } catch (err) { - result = ''; } // Seek locks the file, so seek to the beginning only if necko hasn't diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index f99636f4c9..166bb6c8d4 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1319 -Changed: lushnikov@chromium.org Mon Mar 7 16:04:44 PST 2022 +1320 +Changed: yurys@chromium.org Fri 18 Mar 2022 05:34:13 PM PDT diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js index f7e7659f8d..a800f1e342 100644 --- a/browser_patches/firefox/juggler/NetworkObserver.js +++ b/browser_patches/firefox/juggler/NetworkObserver.js @@ -754,16 +754,11 @@ function readRequestPostData(httpChannel) { } // Read data from the stream. - let result = undefined; + let result = ''; try { - const buffer = NetUtil.readInputStream(iStream, iStream.available()); - const bytes = new Uint8Array(buffer); - let binary = ''; - for (let i = 0; i < bytes.byteLength; i++) - binary += String.fromCharCode(bytes[i]); - result = btoa(binary); + const buffer = NetUtil.readInputStreamToString(iStream, iStream.available()); + result = btoa(buffer); } catch (err) { - result = ''; } // Seek locks the file, so seek to the beginning only if necko hasn't