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

Do 0-byte reads on MacOS (#4560) 

Underlying corefx issue has been fixed
This commit is contained in:
John Luo 2018-12-10 17:25:18 -08:00 committed by GitHub
parent 61d33bed27
commit 97d918e03a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -156,12 +156,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal
{ {
while (true) while (true)
{ {
// MacOS blocked on https://github.com/dotnet/corefx/issues/31766 // Wait for data before allocating a buffer.
if (!IsMacOS) await _receiver.WaitForDataAsync();
{
// Wait for data before allocating a buffer.
await _receiver.WaitForDataAsync();
}
// Ensure we have some reasonable amount of buffer space // Ensure we have some reasonable amount of buffer space
var buffer = Input.GetMemory(MinAllocBufferSize); var buffer = Input.GetMemory(MinAllocBufferSize);
@ -215,7 +211,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal
shutdownReason = new ConnectionResetException(ex.Message, ex);; shutdownReason = new ConnectionResetException(ex.Message, ex);;
_trace.ConnectionReset(ConnectionId); _trace.ConnectionReset(ConnectionId);
} }
catch (Exception ex) catch (Exception ex)
when ((ex is SocketException socketEx && IsConnectionAbortError(socketEx.SocketErrorCode)) || when ((ex is SocketException socketEx && IsConnectionAbortError(socketEx.SocketErrorCode)) ||
ex is ObjectDisposedException) ex is ObjectDisposedException)
{ {