A few more updates from peer review, Eirik's nits.

dotnet · Jul 24, 2023 · ad03a32 · ad03a32
1 parent deb2409
commit ad03a32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...em.Net.Http.Json/src/System/Net/Http/Json/HttpClientJsonExtensions.Get.AsyncEnumerable.cs b/...em.Net.Http.Json/src/System/Net/Http/Json/HttpClientJsonExtensions.Get.AsyncEnumerable.cs
@@ -137,6 +137,7 @@ public static partial class HttpClientJsonExtensions
         {
             options ??= JsonSerializerOptions.Default;
             options.MakeReadOnly();
+
             var jsonTypeInfo = (JsonTypeInfo<TValue>)options.GetTypeInfo(typeof(TValue));
 
             return FromJsonStreamAsyncCore(client, requestUri, jsonTypeInfo, cancellationToken);
@@ -161,13 +162,13 @@ public static partial class HttpClientJsonExtensions
                 JsonTypeInfo<TValue> jsonTypeInfo,
                 [EnumeratorCancellation] CancellationToken cancellationToken)
             {
-                using HttpResponseMessage response = await s_getAsync(client, requestUri, cancellationToken)
+                Debug.Assert(client.MaxResponseContentBufferSize is > 0 and <= int.MaxValue);
+
+                using HttpResponseMessage response = await client.GetAsync(requestUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken)
                     .ConfigureAwait(false);
 
                 response.EnsureSuccessStatusCode();
 
-                Debug.Assert(client.MaxResponseContentBufferSize is > 0 and <= int.MaxValue);
-
                 using Stream contentStream = await HttpContentJsonExtensions.GetContentStreamAsync(
                     response.Content, cancellationToken).ConfigureAwait(false);
 

diff --git a/...ystem.Net.Http.Json/src/System/Net/Http/Json/HttpContentJsonExtensions.AsyncEnumerable.cs b/...ystem.Net.Http.Json/src/System/Net/Http/Json/HttpContentJsonExtensions.AsyncEnumerable.cs
@@ -68,6 +68,8 @@ public static partial class HttpContentJsonExtensions
             CancellationToken cancellationToken)
         {
             options ??= JsonSerializerOptions.Default;
+            options.MakeReadOnly();
+
             var jsonTypeInfo = (JsonTypeInfo<TValue>)options.GetTypeInfo(typeof(TValue));
 
             return ReadFromJsonAsAsyncEnumerableCore(content, jsonTypeInfo, cancellationToken);