From 56336f3bda2ee8241b23a54b12e5cd300d8f15b1 Mon Sep 17 00:00:00 2001
From: Brian Quinlan <bquinlan@google.com>
Date: Thu, 1 May 2025 11:42:07 -0700
Subject: [PATCH 1/6] Make response headers tests pass on firefox

---
 .github/workflows/dart.yml                    | 214 ++++++++++++++----
 pkgs/http/mono_pkg.yaml                       |   7 +-
 .../lib/src/response_headers_tests.dart       |   1 +
 tool/ci.sh                                    |  22 +-
 4 files changed, 193 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 0e8b82faa4..3f2c485929 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -1,4 +1,4 @@
-# Created with package:mono_repo v6.6.2
+# Created with package:mono_repo v6.6.3
 name: Dart CI
 on:
   push:
@@ -36,7 +36,7 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: mono_repo self validate
-        run: dart pub global activate mono_repo 6.6.2
+        run: dart pub global activate mono_repo 6.6.3
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
@@ -335,7 +335,7 @@ jobs:
       - job_005
       - job_006
   job_008:
-    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --platform chrome`"
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform chrome`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -360,8 +360,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --platform chrome"
-        run: dart test --platform chrome
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform chrome"
+        run: "dart test --test-randomize-ordering-seed=random --platform chrome"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -372,16 +372,16 @@ jobs:
       - job_005
       - job_006
   job_009:
-    name: "unit_test; linux; Dart 3.4.0; PKGS: pkgs/http, pkgs/http_profile; `dart test --platform vm`"
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http-pkgs/http_profile;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:test_4"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http-pkgs/http_profile
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -397,10 +397,75 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --platform vm"
-        run: dart test --platform vm
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform firefox"
+        run: "dart test --test-randomize-ordering-seed=random --platform firefox"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+      - job_005
+      - job_006
+  job_010:
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:test_2"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+        with:
+          sdk: "3.4.0"
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - id: pkgs_http_pub_upgrade
+        name: pkgs/http; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: pkgs/http
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform vm"
+        run: "dart test --test-randomize-ordering-seed=random --platform vm"
+        if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
+        working-directory: pkgs/http
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+      - job_005
+      - job_006
+  job_011:
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http_profile; `dart test --platform vm`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http_profile;commands:test_6"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http_profile
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+        with:
+          sdk: "3.4.0"
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: pkgs_http_profile_pub_upgrade
         name: pkgs/http_profile; dart pub upgrade
         run: dart pub upgrade
@@ -417,7 +482,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_010:
+  job_012:
     name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2js`"
     runs-on: ubuntu-latest
     steps:
@@ -425,7 +490,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_6"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_8"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -454,7 +519,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_011:
+  job_013:
     name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p vm`"
     runs-on: ubuntu-latest
     steps:
@@ -462,7 +527,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_5"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_7"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -491,7 +556,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_012:
+  job_014:
     name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart run --define=no_default_http_client=true test/no_default_http_client_test.dart`"
     runs-on: ubuntu-latest
     steps:
@@ -528,8 +593,8 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_013:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --platform chrome`"
+  job_015:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform chrome`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -554,8 +619,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --platform chrome"
-        run: dart test --platform chrome
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform chrome"
+        run: "dart test --test-randomize-ordering-seed=random --platform chrome"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -565,17 +630,17 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_014:
-    name: "unit_test; linux; Dart dev; PKGS: pkgs/http, pkgs/http_profile; `dart test --platform vm`"
+  job_016:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http-pkgs/http_profile;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_4"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http-pkgs/http_profile
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -591,19 +656,47 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --platform vm"
-        run: dart test --platform vm
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform firefox"
+        run: "dart test --test-randomize-ordering-seed=random --platform firefox"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
-      - id: pkgs_http_profile_pub_upgrade
-        name: pkgs/http_profile; dart pub upgrade
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+      - job_005
+      - job_006
+  job_017:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_2"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - id: pkgs_http_pub_upgrade
+        name: pkgs/http; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: pkgs/http_profile
-      - name: "pkgs/http_profile; dart test --platform vm"
-        run: dart test --platform vm
-        if: "always() && steps.pkgs_http_profile_pub_upgrade.conclusion == 'success'"
-        working-directory: pkgs/http_profile
+        working-directory: pkgs/http
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform vm"
+        run: "dart test --test-randomize-ordering-seed=random --platform vm"
+        if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
+        working-directory: pkgs/http
     needs:
       - job_001
       - job_002
@@ -611,7 +704,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_015:
+  job_018:
     name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`"
     runs-on: ubuntu-latest
     steps:
@@ -619,7 +712,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_4"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_5"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -648,7 +741,44 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_016:
+  job_019:
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http_profile; `dart test --platform vm`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http_profile;commands:test_6"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http_profile
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - id: pkgs_http_profile_pub_upgrade
+        name: pkgs/http_profile; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: pkgs/http_profile
+      - name: "pkgs/http_profile; dart test --platform vm"
+        run: dart test --platform vm
+        if: "always() && steps.pkgs_http_profile_pub_upgrade.conclusion == 'success'"
+        working-directory: pkgs/http_profile
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+      - job_005
+      - job_006
+  job_020:
     name: "unit_test; linux; Dart dev; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2js`"
     runs-on: ubuntu-latest
     steps:
@@ -656,7 +786,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_6"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_8"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -685,7 +815,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_017:
+  job_021:
     name: "unit_test; linux; Dart dev; PKG: pkgs/web_socket; `dart test --test-randomize-ordering-seed=random -p vm`"
     runs-on: ubuntu-latest
     steps:
@@ -693,7 +823,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_5"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_7"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -722,7 +852,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_018:
+  job_022:
     name: "unit_test; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test --platform chrome`"
     runs-on: ubuntu-latest
     steps:
@@ -759,7 +889,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_019:
+  job_023:
     name: "unit_test; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
     runs-on: ubuntu-latest
     steps:
@@ -796,7 +926,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_020:
+  job_024:
     name: "unit_test; macos; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
     runs-on: macos-latest
     steps:
@@ -833,7 +963,7 @@ jobs:
       - job_004
       - job_005
       - job_006
-  job_021:
+  job_025:
     name: "unit_test; windows; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
     runs-on: windows-latest
     steps:
diff --git a/pkgs/http/mono_pkg.yaml b/pkgs/http/mono_pkg.yaml
index 06f79d9816..475e6a1be0 100644
--- a/pkgs/http/mono_pkg.yaml
+++ b/pkgs/http/mono_pkg.yaml
@@ -9,10 +9,13 @@ stages:
     sdk:
     - dev
 - unit_test:
-  - test: --platform vm
+  - test: --test-randomize-ordering-seed=random --platform vm
     os:
     - linux
-  - test: --platform chrome
+  - test: --test-randomize-ordering-seed=random --platform chrome
+    os:
+    - linux
+  - test: --test-randomize-ordering-seed=random --platform firefox
     os:
     - linux
   - command: dart run --define=no_default_http_client=true test/no_default_http_client_test.dart
diff --git a/pkgs/http_client_conformance_tests/lib/src/response_headers_tests.dart b/pkgs/http_client_conformance_tests/lib/src/response_headers_tests.dart
index c49af29699..e3c1256478 100644
--- a/pkgs/http_client_conformance_tests/lib/src/response_headers_tests.dart
+++ b/pkgs/http_client_conformance_tests/lib/src/response_headers_tests.dart
@@ -182,6 +182,7 @@ void testResponseHeaders(Client client,
                 // Common client behavior (Cronet, Apple URL Loading System).
                 '1',
                 '1\r2', // Common client behavior (Java).
+                isNull, // Common client behavior (Firefox).
               ));
         } on ClientException {
           // The client rejected the response, which is allowed per RFC-9110.
diff --git a/tool/ci.sh b/tool/ci.sh
index 133b358da3..728040875a 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Created with package:mono_repo v6.6.2
+# Created with package:mono_repo v6.6.3
 
 # Support built in commands on windows out of the box.
 
@@ -88,22 +88,30 @@ for PKG in ${PKGS}; do
         flutter test --platform chrome || EXIT_CODE=$?
         ;;
       test_2)
-        echo 'dart test --platform vm'
-        dart test --platform vm || EXIT_CODE=$?
+        echo 'dart test --test-randomize-ordering-seed=random --platform vm'
+        dart test --test-randomize-ordering-seed=random --platform vm || EXIT_CODE=$?
         ;;
       test_3)
-        echo 'dart test --platform chrome'
-        dart test --platform chrome || EXIT_CODE=$?
+        echo 'dart test --test-randomize-ordering-seed=random --platform chrome'
+        dart test --test-randomize-ordering-seed=random --platform chrome || EXIT_CODE=$?
         ;;
       test_4)
+        echo 'dart test --test-randomize-ordering-seed=random --platform firefox'
+        dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
+        ;;
+      test_5)
         echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm'
         dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm || EXIT_CODE=$?
         ;;
-      test_5)
+      test_6)
+        echo 'dart test --platform vm'
+        dart test --platform vm || EXIT_CODE=$?
+        ;;
+      test_7)
         echo 'dart test --test-randomize-ordering-seed=random -p vm'
         dart test --test-randomize-ordering-seed=random -p vm || EXIT_CODE=$?
         ;;
-      test_6)
+      test_8)
         echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2js'
         dart test --test-randomize-ordering-seed=random -p chrome -c dart2js || EXIT_CODE=$?
         ;;

From 9d7e24a5701af1c2ac196de695698f67ecf5c1a1 Mon Sep 17 00:00:00 2001
From: Brian Quinlan <bquinlan@google.com>
Date: Thu, 1 May 2025 13:04:01 -0700
Subject: [PATCH 2/6] Firefix

---
 .github/workflows/dart.yml | 56 +++++++++++++++++++-------------------
 pkgs/http/mono_pkg.yaml    |  3 +-
 tool/ci.sh                 | 14 +++++-----
 3 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 3f2c485929..c60abd6979 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -305,7 +305,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_2"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -372,14 +372,14 @@ jobs:
       - job_005
       - job_006
   job_009:
-    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform firefox`"
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:test_4"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:test_2"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -397,8 +397,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform firefox"
-        run: "dart test --test-randomize-ordering-seed=random --platform firefox"
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform vm"
+        run: "dart test --test-randomize-ordering-seed=random --platform vm"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -409,14 +409,14 @@ jobs:
       - job_005
       - job_006
   job_010:
-    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http;commands:command_1"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -434,8 +434,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform vm"
-        run: "dart test --test-randomize-ordering-seed=random --platform vm"
+      - name: "pkgs/http; xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
+        run: "xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -453,7 +453,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http_profile;commands:test_6"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http_profile;commands:test_5"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/http_profile
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -490,7 +490,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_8"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_7"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -527,7 +527,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_7"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket;commands:test_6"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
@@ -564,7 +564,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_2"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -631,14 +631,14 @@ jobs:
       - job_005
       - job_006
   job_016:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform firefox`"
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_4"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_2"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -656,8 +656,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform firefox"
-        run: "dart test --test-randomize-ordering-seed=random --platform firefox"
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform vm"
+        run: "dart test --test-randomize-ordering-seed=random --platform vm"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -668,14 +668,14 @@ jobs:
       - job_005
       - job_006
   job_017:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random --platform vm`"
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_4"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -693,8 +693,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random --platform vm"
-        run: "dart test --test-randomize-ordering-seed=random --platform vm"
+      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm"
+        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -705,14 +705,14 @@ jobs:
       - job_005
       - job_006
   job_018:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`"
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:test_5"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http;commands:command_1"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -730,8 +730,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm"
-        run: "dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm"
+      - name: "pkgs/http; xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
+        run: "xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -749,7 +749,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http_profile;commands:test_6"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http_profile;commands:test_5"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/http_profile
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -786,7 +786,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_8"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_7"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
@@ -823,7 +823,7 @@ jobs:
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_7"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket;commands:test_6"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/web_socket
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
diff --git a/pkgs/http/mono_pkg.yaml b/pkgs/http/mono_pkg.yaml
index 475e6a1be0..a96a82cbe5 100644
--- a/pkgs/http/mono_pkg.yaml
+++ b/pkgs/http/mono_pkg.yaml
@@ -15,7 +15,8 @@ stages:
   - test: --test-randomize-ordering-seed=random --platform chrome
     os:
     - linux
-  - test: --test-randomize-ordering-seed=random --platform firefox
+  - command: xvfb-run -s "-screen 0 1024x768x24" &&
+      dart test --test-randomize-ordering-seed=random --platform firefox
     os:
     - linux
   - command: dart run --define=no_default_http_client=true test/no_default_http_client_test.dart
diff --git a/tool/ci.sh b/tool/ci.sh
index 728040875a..40e243cddf 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -76,6 +76,10 @@ for PKG in ${PKGS}; do
         flutter test || EXIT_CODE=$?
         ;;
       command_1)
+        echo 'xvfb-run -s "-screen 0 1024x768x24" && dart test --test-randomize-ordering-seed=random --platform firefox'
+        xvfb-run -s "-screen 0 1024x768x24" && dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
+        ;;
+      command_2)
         echo 'dart run --define=no_default_http_client=true test/no_default_http_client_test.dart'
         dart run --define=no_default_http_client=true test/no_default_http_client_test.dart || EXIT_CODE=$?
         ;;
@@ -96,22 +100,18 @@ for PKG in ${PKGS}; do
         dart test --test-randomize-ordering-seed=random --platform chrome || EXIT_CODE=$?
         ;;
       test_4)
-        echo 'dart test --test-randomize-ordering-seed=random --platform firefox'
-        dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
-        ;;
-      test_5)
         echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm'
         dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm || EXIT_CODE=$?
         ;;
-      test_6)
+      test_5)
         echo 'dart test --platform vm'
         dart test --platform vm || EXIT_CODE=$?
         ;;
-      test_7)
+      test_6)
         echo 'dart test --test-randomize-ordering-seed=random -p vm'
         dart test --test-randomize-ordering-seed=random -p vm || EXIT_CODE=$?
         ;;
-      test_8)
+      test_7)
         echo 'dart test --test-randomize-ordering-seed=random -p chrome -c dart2js'
         dart test --test-randomize-ordering-seed=random -p chrome -c dart2js || EXIT_CODE=$?
         ;;

From 56126485df6cb6a85c6ea819dbca46d196ec947a Mon Sep 17 00:00:00 2001
From: Brian Quinlan <bquinlan@google.com>
Date: Thu, 1 May 2025 13:05:40 -0700
Subject: [PATCH 3/6] Update mono_pkg.yaml

---
 pkgs/http/mono_pkg.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/http/mono_pkg.yaml b/pkgs/http/mono_pkg.yaml
index a96a82cbe5..82b4923ac6 100644
--- a/pkgs/http/mono_pkg.yaml
+++ b/pkgs/http/mono_pkg.yaml
@@ -15,6 +15,7 @@ stages:
   - test: --test-randomize-ordering-seed=random --platform chrome
     os:
     - linux
+  # Firefox needs a X server to work.
   - command: xvfb-run -s "-screen 0 1024x768x24" &&
       dart test --test-randomize-ordering-seed=random --platform firefox
     os:

From 7b44860e9abb5df34db03895c910ff053f0d74aa Mon Sep 17 00:00:00 2001
From: Brian Quinlan <bquinlan@google.com>
Date: Thu, 1 May 2025 13:09:04 -0700
Subject: [PATCH 4/6] Update mono_pkg.yaml

---
 pkgs/http/mono_pkg.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/http/mono_pkg.yaml b/pkgs/http/mono_pkg.yaml
index 82b4923ac6..bbacc334db 100644
--- a/pkgs/http/mono_pkg.yaml
+++ b/pkgs/http/mono_pkg.yaml
@@ -16,7 +16,7 @@ stages:
     os:
     - linux
   # Firefox needs a X server to work.
-  - command: xvfb-run -s "-screen 0 1024x768x24" &&
+  - command: xvfb-run -s "-screen 0 1024x768x24"
       dart test --test-randomize-ordering-seed=random --platform firefox
     os:
     - linux

From dffe304143f138940b738007bb7a398280ac044b Mon Sep 17 00:00:00 2001
From: Brian Quinlan <bquinlan@google.com>
Date: Thu, 1 May 2025 13:09:59 -0700
Subject: [PATCH 5/6] Fix

---
 .github/workflows/dart.yml | 12 ++++++------
 tool/ci.sh                 |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index c60abd6979..bfbf869e47 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -409,7 +409,7 @@ jobs:
       - job_005
       - job_006
   job_010:
-    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox`"
+    name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -434,8 +434,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
-        run: "xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
+      - name: "pkgs/http; xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox"
+        run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
@@ -705,7 +705,7 @@ jobs:
       - job_005
       - job_006
   job_018:
-    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox`"
+    name: "unit_test; linux; Dart dev; PKG: pkgs/http; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -730,8 +730,8 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: pkgs/http
-      - name: "pkgs/http; xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
-        run: "xvfb-run -s \"-screen 0 1024x768x24\" && dart test --test-randomize-ordering-seed=random --platform firefox"
+      - name: "pkgs/http; xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox"
+        run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --test-randomize-ordering-seed=random --platform firefox"
         if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
         working-directory: pkgs/http
     needs:
diff --git a/tool/ci.sh b/tool/ci.sh
index 40e243cddf..a200e66543 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -76,8 +76,8 @@ for PKG in ${PKGS}; do
         flutter test || EXIT_CODE=$?
         ;;
       command_1)
-        echo 'xvfb-run -s "-screen 0 1024x768x24" && dart test --test-randomize-ordering-seed=random --platform firefox'
-        xvfb-run -s "-screen 0 1024x768x24" && dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
+        echo 'xvfb-run -s "-screen 0 1024x768x24" dart test --test-randomize-ordering-seed=random --platform firefox'
+        xvfb-run -s "-screen 0 1024x768x24" dart test --test-randomize-ordering-seed=random --platform firefox || EXIT_CODE=$?
         ;;
       command_2)
         echo 'dart run --define=no_default_http_client=true test/no_default_http_client_test.dart'

From f3330da9455acf3636ff35bf05c4ca39edc656a9 Mon Sep 17 00:00:00 2001
From: Brian Quinlan <bquinlan@google.com>
Date: Thu, 1 May 2025 13:16:48 -0700
Subject: [PATCH 6/6] Update mono_pkg.yaml

---
 pkgs/http/mono_pkg.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/http/mono_pkg.yaml b/pkgs/http/mono_pkg.yaml
index bbacc334db..ad3edd4f55 100644
--- a/pkgs/http/mono_pkg.yaml
+++ b/pkgs/http/mono_pkg.yaml
@@ -15,7 +15,7 @@ stages:
   - test: --test-randomize-ordering-seed=random --platform chrome
     os:
     - linux
-  # Firefox needs a X server to work.
+  # Firefox needs an X server to run.
   - command: xvfb-run -s "-screen 0 1024x768x24"
       dart test --test-randomize-ordering-seed=random --platform firefox
     os: