From c848257f16966be3cb5d9017c8c01a01f820bc46 Mon Sep 17 00:00:00 2001
From: Dragana Damjanovic
Date: Fri, 28 May 2021 15:33:55 +0000
Subject: [PATCH] Bug 1710821 - Enable HTTP/3 final version by default
r=necko-reviewers,kershaw
Differential Revision: https://phabricator.services.mozilla.com/D114960
---
modules/libpref/init/StaticPrefList.yaml | 2 +-
netwerk/test/unit/test_http3_version1.js | 1 +
netwerk/test/unit/test_trr_https_fallback.js | 34 ++++++++++----------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index bcaefef22df8..32f756954846 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -9696,7 +9696,7 @@
# Support http3 version1
- name: network.http.http3.support_version1
type: RelaxedAtomicBool
- value: false
+ value: true
mirror: always
#---------------------------------------------------------------------------
diff --git a/netwerk/test/unit/test_http3_version1.js b/netwerk/test/unit/test_http3_version1.js
index fd6954eeb053..f1d8f942e81e 100644
--- a/netwerk/test/unit/test_http3_version1.js
+++ b/netwerk/test/unit/test_http3_version1.js
@@ -71,6 +71,7 @@ Http3Listener.prototype = {
};
add_task(async function test_version1_enabled_1() {
+ Services.prefs.setBoolPref("network.http.http3.support_version1", true);
let listener = new Http3Listener();
listener.version1enabled = true;
let chan = makeChan("https://foo.example.com/");
diff --git a/netwerk/test/unit/test_trr_https_fallback.js b/netwerk/test/unit/test_trr_https_fallback.js
index 4b2cb39797b9..7afaf2e36d80 100644
--- a/netwerk/test/unit/test_trr_https_fallback.js
+++ b/netwerk/test/unit/test_trr_https_fallback.js
@@ -105,7 +105,7 @@ add_task(async function testFallbackToTheLastRecord() {
priority: 1,
name: "test.fallback1.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "123..." },
],
},
@@ -119,7 +119,7 @@ add_task(async function testFallbackToTheLastRecord() {
priority: 4,
name: "foo.example.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "port", value: h2Port },
{ key: "echconfig", value: "456..." },
],
@@ -134,7 +134,7 @@ add_task(async function testFallbackToTheLastRecord() {
priority: 3,
name: "test.fallback3.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -148,7 +148,7 @@ add_task(async function testFallbackToTheLastRecord() {
priority: 2,
name: "test.fallback2.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -190,7 +190,7 @@ add_task(async function testFallbackToTheOrigin() {
priority: 1,
name: "test.foo1.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "123..." },
],
},
@@ -204,7 +204,7 @@ add_task(async function testFallbackToTheOrigin() {
priority: 3,
name: "test.foo3.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -218,7 +218,7 @@ add_task(async function testFallbackToTheOrigin() {
priority: 2,
name: "test.foo2.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -273,7 +273,7 @@ add_task(async function testAllRecordsFailed() {
priority: 1,
name: "test.bar1.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "123..." },
],
},
@@ -287,7 +287,7 @@ add_task(async function testAllRecordsFailed() {
priority: 3,
name: "test.bar3.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -301,7 +301,7 @@ add_task(async function testAllRecordsFailed() {
priority: 2,
name: "test.bar2.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -341,7 +341,7 @@ add_task(async function testFallbackToTheOrigin2() {
data: {
priority: 1,
name: "test.example1.com",
- values: [{ key: "alpn", value: ["h2", "h3"] }],
+ values: [{ key: "alpn", value: ["h2", "h3-26"] }],
},
},
{
@@ -352,7 +352,7 @@ add_task(async function testFallbackToTheOrigin2() {
data: {
priority: 3,
name: "test.example3.com",
- values: [{ key: "alpn", value: ["h2", "h3"] }],
+ values: [{ key: "alpn", value: ["h2", "h3-26"] }],
},
},
],
@@ -419,7 +419,7 @@ add_task(async function testFallbackToTheOrigin3() {
priority: 1,
name: "vulnerable1.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -433,7 +433,7 @@ add_task(async function testFallbackToTheOrigin3() {
priority: 2,
name: "vulnerable2.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},
@@ -446,7 +446,7 @@ add_task(async function testFallbackToTheOrigin3() {
data: {
priority: 3,
name: "vulnerable3.com",
- values: [{ key: "alpn", value: ["h2", "h3"] }],
+ values: [{ key: "alpn", value: ["h2", "h3-26"] }],
},
},
],
@@ -486,7 +486,7 @@ add_task(async function testResetExclusionList() {
priority: 1,
name: "test.reset1.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "port", value: h2Port },
{ key: "echconfig", value: "456..." },
],
@@ -501,7 +501,7 @@ add_task(async function testResetExclusionList() {
priority: 2,
name: "test.reset2.com",
values: [
- { key: "alpn", value: ["h2", "h3"] },
+ { key: "alpn", value: ["h2", "h3-26"] },
{ key: "echconfig", value: "456..." },
],
},