From: Stephen Toub Date: Sat, 22 Feb 2020 00:44:09 +0000 (-0500) Subject: Fix several HTTP/3 uses of ValueTask (#32671) X-Git-Tag: submit/tizen/20210909.063632~9556 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78de4bee68a727d8adf45869b484d68c2c287682;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Fix several HTTP/3 uses of ValueTask (#32671) --- diff --git a/src/libraries/Common/src/System/Net/Http/aspnetcore/Quic/Implementations/MsQuic/MsQuicStream.cs b/src/libraries/Common/src/System/Net/Http/aspnetcore/Quic/Implementations/MsQuic/MsQuicStream.cs index 536968b..00ca779 100644 --- a/src/libraries/Common/src/System/Net/Http/aspnetcore/Quic/Implementations/MsQuic/MsQuicStream.cs +++ b/src/libraries/Common/src/System/Net/Http/aspnetcore/Quic/Implementations/MsQuic/MsQuicStream.cs @@ -402,7 +402,7 @@ namespace System.Net.Quic.Implementations.MsQuic { ThrowIfDisposed(); - return ReadAsync(buffer.ToArray()).GetAwaiter().GetResult(); + return ReadAsync(buffer.ToArray()).AsTask().GetAwaiter().GetResult(); } internal override void Write(ReadOnlySpan buffer) @@ -410,7 +410,7 @@ namespace System.Net.Quic.Implementations.MsQuic ThrowIfDisposed(); // TODO: optimize this. - WriteAsync(buffer.ToArray()).GetAwaiter().GetResult(); + WriteAsync(buffer.ToArray()).AsTask().GetAwaiter().GetResult(); } // MsQuic doesn't support explicit flushing diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs index 4280cee..9ed1fc9f 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs @@ -423,7 +423,7 @@ namespace System.Net.Http memberName, // method name message); // message - private async ValueTask SendSettingsAsync() + private async Task SendSettingsAsync() { try { diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs index cbc704d..c15594b 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs @@ -983,7 +983,7 @@ namespace System.Net.Http while (buffer.Length != 0) { // Sync over async here -- QUIC implementation does it per-I/O already; this is at least more coarse-grained. - if (_responseDataPayloadRemaining <= 0 && !ReadNextDataFrameAsync(response, CancellationToken.None).GetAwaiter().GetResult()) + if (_responseDataPayloadRemaining <= 0 && !ReadNextDataFrameAsync(response, CancellationToken.None).AsTask().GetAwaiter().GetResult()) { // End of stream. break;