Merge branch 'release/2.2'

2018-11-14 12:06:23 -08:00 · 2018-11-14 12:06:23 -08:00 · 446f5a8cdf
parent 0544290038 0029b8f053
commit 446f5a8cdf
1 changed files with 4 additions and 0 deletions
--- a/src/Kestrel.Transport.Sockets/Internal/SocketReceiver.cs
+++ b/src/Kestrel.Transport.Sockets/Internal/SocketReceiver.cs
@ -15,7 +15,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal

        public SocketAwaitableEventArgs WaitForDataAsync()
        {
+#if NETCOREAPP2_1
+            _awaitableEventArgs.SetBuffer(Memory<byte>.Empty);
+#else
            _awaitableEventArgs.SetBuffer(Array.Empty<byte>(), 0, 0);
+#endif

            if (!_socket.ReceiveAsync(_awaitableEventArgs))
            {