diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /devel/electron32/files/patch-net_base_features.cc | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'devel/electron32/files/patch-net_base_features.cc')
| -rw-r--r-- | devel/electron32/files/patch-net_base_features.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/devel/electron32/files/patch-net_base_features.cc b/devel/electron32/files/patch-net_base_features.cc deleted file mode 100644 index 908abc1e27f2..000000000000 --- a/devel/electron32/files/patch-net_base_features.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- net/base/features.cc.orig 2024-08-14 20:55:08 UTC -+++ net/base/features.cc -@@ -26,7 +26,7 @@ BASE_FEATURE(kAsyncDns, - BASE_FEATURE(kAsyncDns, - "AsyncDns", - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -506,7 +506,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, - "SpdyHeadersToHttpResponseUseBuilder", - base::FEATURE_DISABLED_BY_DEFAULT); - -+#if BUILDFLAG(IS_OPENBSD) -+// No IP_RECVTOS support - BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); -+#else -+BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); -+#endif - - BASE_FEATURE(kUseNewAlpsCodepointHttp2, - "UseNewAlpsCodepointHttp2", |