huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
Stephen Halter 2018-11-14 12:06:23 -08:00
parent 0544290038 0029b8f053
commit 446f5a8cdf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kestrel.Transport.Sockets/Internal/SocketReceiver.cs
View File

@ -15,7 +15,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal
public SocketAwaitableEventArgs WaitForDataAsync() public SocketAwaitableEventArgs WaitForDataAsync()
{ {
#if NETCOREAPP2_1
_awaitableEventArgs.SetBuffer(Memory<byte>.Empty);
#else
_awaitableEventArgs.SetBuffer(Array.Empty<byte>(), 0, 0); _awaitableEventArgs.SetBuffer(Array.Empty<byte>(), 0, 0);
#endif
if (!_socket.ReceiveAsync(_awaitableEventArgs)) if (!_socket.ReceiveAsync(_awaitableEventArgs))
{ {