diff options
Diffstat (limited to 'lib/Net.Http')
-rw-r--r-- | lib/Net.Http/src/AlternateProtocolBase.cs | 11 | ||||
-rw-r--r-- | lib/Net.Http/src/Core/InitDataBuffer.cs | 10 | ||||
-rw-r--r-- | lib/Net.Http/src/Core/RequestParse/Http11ParseExtensions.cs | 7 |
3 files changed, 16 insertions, 12 deletions
diff --git a/lib/Net.Http/src/AlternateProtocolBase.cs b/lib/Net.Http/src/AlternateProtocolBase.cs index e7b9a61..ab9f906 100644 --- a/lib/Net.Http/src/AlternateProtocolBase.cs +++ b/lib/Net.Http/src/AlternateProtocolBase.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: VNLib.Net.Http @@ -27,8 +27,6 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using VNLib.Net.Http.Core; - namespace VNLib.Net.Http { /// <summary> @@ -58,8 +56,9 @@ namespace VNLib.Net.Http try { //Call child initialize method - await RunAsync(transport); - CancelSource.Cancel(); + await RunAsync(transport).ConfigureAwait(false); + + await CancelSource.CancelAsync(); } finally { @@ -73,7 +72,7 @@ namespace VNLib.Net.Http /// <summary> /// Is the current socket connected using transport security /// </summary> - public virtual bool IsSecure { get; init; } + public required virtual bool IsSecure { get; init; } /// <summary> /// Determines if the instance is pending cancelation diff --git a/lib/Net.Http/src/Core/InitDataBuffer.cs b/lib/Net.Http/src/Core/InitDataBuffer.cs index 6d559cd..d66b34a 100644 --- a/lib/Net.Http/src/Core/InitDataBuffer.cs +++ b/lib/Net.Http/src/Core/InitDataBuffer.cs @@ -128,11 +128,11 @@ namespace VNLib.Net.Http.Core int bytesToRead = Math.Min(Remaining, buffer.Length); MemoryUtil.Memmove( - ref MemoryMarshal.GetArrayDataReference(_buffer), - (nuint)GetDataPosition(), - ref MemoryMarshal.GetReference(buffer), - 0, - (nuint)bytesToRead + src: in MemoryMarshal.GetArrayDataReference(_buffer), + srcOffset: (nuint)GetDataPosition(), + dst: ref MemoryMarshal.GetReference(buffer), + dstOffset: 0, + elementCount: (nuint)bytesToRead ); //Update position pointer diff --git a/lib/Net.Http/src/Core/RequestParse/Http11ParseExtensions.cs b/lib/Net.Http/src/Core/RequestParse/Http11ParseExtensions.cs index 8e4e0e2..dcbd4af 100644 --- a/lib/Net.Http/src/Core/RequestParse/Http11ParseExtensions.cs +++ b/lib/Net.Http/src/Core/RequestParse/Http11ParseExtensions.cs @@ -570,7 +570,12 @@ namespace VNLib.Net.Http.Core /// <param name="reader">The <see cref="VnStreamReader"/> to read lines from the transport</param> /// <returns>0 if the request line was successfully parsed, a status code if the request could not be processed</returns> [MethodImpl(MethodImplOptions.AggressiveOptimization | MethodImplOptions.AggressiveInlining)] - public static HttpStatusCode Http1PrepareEntityBody(this HttpRequest Request, ref Http1ParseState parseState, ref TransportReader reader, ref readonly HttpConfig Config) + public static HttpStatusCode Http1PrepareEntityBody( + this HttpRequest Request, + ref Http1ParseState parseState, + ref TransportReader reader, + ref readonly HttpConfig Config + ) { /* * Evil mutable struct, get a local mutable reference to the request's |