Merge branch 'release/2.2'

2018-11-14 13:43:25 -08:00 · 2018-11-14 13:43:25 -08:00 · 5d80016b4f
parent 446f5a8cdf 4598850c20
commit 5d80016b4f
1 changed files with 0 additions and 4 deletions
--- a/src/Kestrel.Transport.Sockets/Internal/SocketReceiver.cs
+++ b/src/Kestrel.Transport.Sockets/Internal/SocketReceiver.cs
@ -15,11 +15,7 @@ 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))
            {