From 2b32e908b3c306bab900955d425c6ec6cab2876b Mon Sep 17 00:00:00 2001
From: Brian Quinlan <brian@sweetapp.com>
Date: Mon, 4 Dec 2023 13:09:42 -0800
Subject: [PATCH 1/3] Update
 pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart

Co-authored-by: Nate Bosch <nbosch1@gmail.com>
---
 .../integration_test/url_session_configuration_test.dart       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart b/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart
index bef8352f69..c8e4ce483b 100644
--- a/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart
+++ b/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart
@@ -27,8 +27,7 @@ Future<Map<String, List<String>>> sentHeaders(
       URLRequest.fromUrl(Uri.parse('http://localhost:${server.port}')))
     ..resume();
   while (task.state != URLSessionTaskState.urlSessionTaskStateCompleted) {
-    // Let the event loop run.
-    await Future<void>.delayed(const Duration());
+    await pumpEventQueue();
   }
 
   await server.close();

From 4d0faa63b1dca3fe817ff67324c3eed618e9da9a Mon Sep 17 00:00:00 2001
From: Brian Quinlan <brian@sweetapp.com>
Date: Mon, 4 Dec 2023 13:11:27 -0800
Subject: [PATCH 2/3] Update
 pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart

Co-authored-by: Nate Bosch <nbosch1@gmail.com>
---
 .../integration_test/url_session_configuration_test.dart      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart b/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart
index c8e4ce483b..ab117c37d0 100644
--- a/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart
+++ b/pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart
@@ -23,8 +23,8 @@ Future<Map<String, List<String>>> sentHeaders(
       await request.response.close();
     });
 
-  final task = session.dataTaskWithRequest(
-      URLRequest.fromUrl(Uri.parse('http://localhost:${server.port}')))
+  final task = session.dataTaskWithRequest(URLRequest.fromUrl(
+      Uri(scheme: 'http', host: 'localhost', port: server.port)))
     ..resume();
   while (task.state != URLSessionTaskState.urlSessionTaskStateCompleted) {
     await pumpEventQueue();

From 60d062ef1f60d1547152410c3e4304370fe33fed Mon Sep 17 00:00:00 2001
From: Brian Quinlan <brian@sweetapp.com>
Date: Mon, 4 Dec 2023 13:11:41 -0800
Subject: [PATCH 3/3] Update pkgs/cupertino_http/lib/src/cupertino_api.dart

Co-authored-by: Nate Bosch <nbosch1@gmail.com>
---
 pkgs/cupertino_http/lib/src/cupertino_api.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/cupertino_http/lib/src/cupertino_api.dart b/pkgs/cupertino_http/lib/src/cupertino_api.dart
index 0317eeb834..5cebd7ed42 100644
--- a/pkgs/cupertino_http/lib/src/cupertino_api.dart
+++ b/pkgs/cupertino_http/lib/src/cupertino_api.dart
@@ -350,11 +350,11 @@ class URLSessionConfiguration
   ///
   /// See [NSURLSessionConfiguration.HTTPAdditionalHeaders](https://developer.apple.com/documentation/foundation/nsurlsessionconfiguration/1411532-httpadditionalheaders)
   Map<String, String>? get httpAdditionalHeaders {
-    if (_nsObject.HTTPAdditionalHeaders == null) {
-      return null;
+    if (_nsObject.HTTPAdditionalHeaders case var additionalHeaders?) {
+      final headers = ncb.NSDictionary.castFrom(additionalHeaders);
+      return stringDictToMap(headers);
     }
-    final headers = ncb.NSDictionary.castFrom(_nsObject.HTTPAdditionalHeaders!);
-    return stringDictToMap(headers);
+    return null;
   }
 
   set httpAdditionalHeaders(Map<String, String>? headers) {