From f7c26f991265323274381b030f136810cf162090 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Sat, 17 Nov 2018 00:18:23 +0000 Subject: [PATCH] [2.2.1] Use non-pinnable buffer for zero byte read (#4066) --- .../Transport.Sockets/src/Internal/SocketReceiver.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs index 5d33f49829..3c3451cbcc 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs @@ -15,7 +15,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal public SocketAwaitableEventArgs WaitForDataAsync() { +#if NETCOREAPP2_1 + _awaitableEventArgs.SetBuffer(Memory.Empty); +#elif NETSTANDARD2_0 _awaitableEventArgs.SetBuffer(Array.Empty(), 0, 0); +#else +#error TFMs need to be updated +#endif if (!_socket.ReceiveAsync(_awaitableEventArgs)) {