[tor-commits] [tor-browser] 24/43: Bug 1727995 - Disable websocket over h2, r=necko-reviewers, dragana, a=RyanVM

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-91.10.0esr-11.0-1
in repository tor-browser.

commit ac2ee493157ba3bb3eb003da5acb4bca6594766d
Author: Kershaw Chang <kershaw at mozilla.com>
AuthorDate: Wed Apr 27 15:11:51 2022 +0000

    Bug 1727995 - Disable websocket over h2, r=necko-reviewers,dragana, a=RyanVM
---
 modules/libpref/init/all.js                           |  2 +-
 .../meta/infrastructure/server/__dir__.ini            |  1 +
 testing/web-platform/meta/websockets/__dir__.ini      |  1 +
 .../meta/websockets/extended-payload-length.html.ini  | 19 +------------------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index c232cda7359eb..363ba5f081623 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1410,7 +1410,7 @@ pref("network.http.spdy.push-allowance", 131072);   // 128KB
 pref("network.http.spdy.pull-allowance", 12582912); // 12MB
 pref("network.http.spdy.default-concurrent", 100);
 pref("network.http.spdy.default-hpack-buffer", 65536); // 64k
-pref("network.http.spdy.websockets", true);
+pref("network.http.spdy.websockets", false);
 pref("network.http.spdy.enable-hpack-dump", false);
 
 // Http3 parameters
diff --git a/testing/web-platform/meta/infrastructure/server/__dir__.ini b/testing/web-platform/meta/infrastructure/server/__dir__.ini
index bbdcef0e3e7ed..1ae99e0180903 100644
--- a/testing/web-platform/meta/infrastructure/server/__dir__.ini
+++ b/testing/web-platform/meta/infrastructure/server/__dir__.ini
@@ -1,2 +1,3 @@
 lsan-disabled: true
 leak-threshold: [default:51200, tab:51200]
+prefs: [network.http.spdy.websockets:true]
diff --git a/testing/web-platform/meta/websockets/__dir__.ini b/testing/web-platform/meta/websockets/__dir__.ini
index 89ba6b5e93f85..cee3dc48fc16c 100644
--- a/testing/web-platform/meta/websockets/__dir__.ini
+++ b/testing/web-platform/meta/websockets/__dir__.ini
@@ -1,2 +1,3 @@
 lsan-disabled: true
 leak-threshold: [default:102400, tab:51200]
+prefs: [network.http.spdy.websockets:true]
diff --git a/testing/web-platform/meta/websockets/extended-payload-length.html.ini b/testing/web-platform/meta/websockets/extended-payload-length.html.ini
index 770047603afed..67bbdac3aff8d 100644
--- a/testing/web-platform/meta/websockets/extended-payload-length.html.ini
+++ b/testing/web-platform/meta/websockets/extended-payload-length.html.ini
@@ -1,22 +1,5 @@
 [extended-payload-length.html?wpt_flags=h2]
-  expected:
-    if (os == "mac") and not debug: [OK, TIMEOUT]
-  [Application data is 126 byte which starts to use the 16 bit 'Extended payload length' field.]
-    expected:
-      if (os == "android") and swgl: [PASS, FAIL]
-      if (os == "mac") and not debug: [PASS, FAIL]
-
-  [Application data is 125 byte which means any 'Extended payload length' field isn't used at all.]
-    expected:
-      if swgl and (os == "android"): [PASS, FAIL]
-
-  [Application data is 0xFFFF byte which means the upper bound of the 16 bit 'Extended payload length' field.]
-    expected:
-      if (os == "mac") and not debug: [PASS, TIMEOUT]
-
-  [Application data is (0xFFFF + 1) byte which starts to use the 64 bit 'Extended payload length' field]
-    expected:
-      if (os == "mac") and not debug: [PASS, TIMEOUT]
+  disabled: Bug 1727995
 
 
 [extended-payload-length.html?wss]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.