diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/GlobalHttpSettings.cs b/src/libraries/System.Net.Http/src/System/Net/Http/GlobalHttpSettings.cs
index 7382f4ca0da13..664d296dcb6d1 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/GlobalHttpSettings.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/GlobalHttpSettings.cs
@@ -26,12 +26,12 @@ internal static class SocketsHttpHandler
"DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP2SUPPORT",
true);
- // Default to allowing draft HTTP/3, but enable that to be overridden
- // by an AppContext switch, or by an environment variable being set to false/0.
- public static bool AllowDraftHttp3 { get; } = RuntimeSettingParser.QueryRuntimeSettingSwitch(
- "System.Net.SocketsHttpHandler.Http3DraftSupport",
- "DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP3DRAFTSUPPORT",
- true);
+ // Default to disable HTTP/3 (and by an extent QUIC), but enable that to be overridden
+ // by an AppContext switch, or by an environment variable being set to true/1.
+ public static bool AllowHttp3 { get; } = RuntimeSettingParser.QueryRuntimeSettingSwitch(
+ "System.Net.SocketsHttpHandler.Http3Support",
+ "DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP3SUPPORT",
+ false);
// Switch to disable the HTTP/2 dynamic window scaling algorithm. Enabled by default.
public static bool DisableDynamicHttp2WindowSizing { get; } = RuntimeSettingParser.QueryRuntimeSettingSwitch(
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
index 03cb3e9a40624..193202756025a 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
@@ -67,7 +67,7 @@ internal sealed class HttpConnectionSettings
public HttpConnectionSettings()
{
bool allowHttp2 = GlobalHttpSettings.SocketsHttpHandler.AllowHttp2;
- bool allowHttp3 = GlobalHttpSettings.SocketsHttpHandler.AllowDraftHttp3;
+ bool allowHttp3 = GlobalHttpSettings.SocketsHttpHandler.AllowHttp3;
_maxHttpVersion =
allowHttp3 && allowHttp2 ? HttpVersion.Version30 :
allowHttp2 ? HttpVersion.Version20 :
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index b3413cbef3053..667b35e9a8afe 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -9,6 +9,10 @@
$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX
+
+
+
+
WasmTestOnBrowser
$(TestArchiveRoot)browseronly/
diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
index 57cbb0859dc80..b133d630a4806 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
@@ -7,6 +7,10 @@
enable
+
+
+
+
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicApi.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicApi.cs
index 2bf1b9b1955e8..ea09d3bf6add5 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicApi.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicApi.cs
@@ -125,10 +125,18 @@ private MsQuicApi(NativeApi* vtable)
static MsQuicApi()
{
- if (OperatingSystem.IsWindows() && !IsWindowsVersionSupported())
+ if (!IsHttp3Enabled())
{
- IsQuicSupported = false;
+ if (NetEventSource.Log.IsEnabled())
+ {
+ NetEventSource.Info(null, $"HTTP/3 and QUIC is not enabled, see 'System.Net.SocketsHttpHandler.Http3Support' AppContext switch.");
+ }
+ return;
+ }
+
+ if (OperatingSystem.IsWindows() && !IsWindowsVersionSupported())
+ {
if (NetEventSource.Log.IsEnabled())
{
NetEventSource.Info(null, $"Current Windows version ({Environment.OSVersion}) is not supported by QUIC. Minimal supported version is {MinWindowsVersion}");
@@ -163,6 +171,34 @@ static MsQuicApi()
}
}
+ // Note that this is copy-pasted from S.N.Http just to hide S.N.Quic behind the same AppContext switch
+ // since this library is considered "private" for 6.0.
+ // We should get rid of this once S.N.Quic API surface is officially exposed.
+ private static bool IsHttp3Enabled()
+ {
+ bool value;
+
+ // First check for the AppContext switch, giving it priority over the environment variable.
+ if (AppContext.TryGetSwitch("System.Net.SocketsHttpHandler.Http3Support", out value))
+ {
+ return value;
+ }
+
+ // AppContext switch wasn't used. Check the environment variable.
+ string? envVar = Environment.GetEnvironmentVariable("DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP3SUPPORT");
+
+ if (bool.TryParse(envVar, out value))
+ {
+ return value;
+ }
+ else if (uint.TryParse(envVar, out uint intVal))
+ {
+ return intVal != 0;
+ }
+
+ return false;
+ }
+
private static bool IsWindowsVersionSupported() => OperatingSystem.IsWindowsVersionAtLeast(MinWindowsVersion.Major,
MinWindowsVersion.Minor, MinWindowsVersion.Build, MinWindowsVersion.Revision);
diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj b/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
index 2a17894a5555a..583b2b6c4861e 100644
--- a/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
@@ -4,6 +4,9 @@
true
$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix
+
+
+