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

Merge release/2.1 into dev

This commit is contained in:
Pavel Krymets 2018-04-03 10:08:50 -07:00
parent ede2d0aff2
commit 5210323385
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -16,6 +16,8 @@
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!-- https://github.com/aspnet/IISIntegration/issues/617 -->
<EnableApiCheck>false</EnableApiCheck>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

14
build/dependencies.props
View File

@ -35,14 +35,14 @@
<MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview3-32094</MicrosoftNetHttpHeadersPackageVersion> <MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview3-32094</MicrosoftNetHttpHeadersPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftWebAdministrationPackageVersion>7.0.0</MicrosoftWebAdministrationPackageVersion> <MicrosoftWebAdministrationPackageVersion>7.0.0</MicrosoftWebAdministrationPackageVersion>
<SystemBuffersPackageVersion>4.5.0-preview2-26326-04</SystemBuffersPackageVersion> <SystemBuffersPackageVersion>4.5.0-preview2-26313-01</SystemBuffersPackageVersion>
<SystemIOPipelinesPackageVersion>4.5.0-preview2-26326-04</SystemIOPipelinesPackageVersion> <SystemIOPipelinesPackageVersion>4.5.0-preview2-26313-01</SystemIOPipelinesPackageVersion>
<SystemManagementAutomationPackageVersion>6.1.7601.17515</SystemManagementAutomationPackageVersion> <SystemManagementAutomationPackageVersion>6.1.7601.17515</SystemManagementAutomationPackageVersion>
<SystemMemoryPackageVersion>4.5.0-preview2-26326-04</SystemMemoryPackageVersion> <SystemMemoryPackageVersion>4.5.0-preview2-26313-01</SystemMemoryPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview2-26326-04</SystemNetWebSocketsWebSocketProtocolPackageVersion> <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview2-26313-01</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemNumericsVectorsPackageVersion>4.5.0-preview2-26326-04</SystemNumericsVectorsPackageVersion> <SystemNumericsVectorsPackageVersion>4.5.0-preview2-26313-01</SystemNumericsVectorsPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26326-04</SystemRuntimeCompilerServicesUnsafePackageVersion> <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26313-01</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview2-26326-04</SystemSecurityPrincipalWindowsPackageVersion> <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview2-26313-01</SystemSecurityPrincipalWindowsPackageVersion>
<Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion> <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
<XunitPackageVersion>2.3.1</XunitPackageVersion> <XunitPackageVersion>2.3.1</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion> <XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>

20
src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs
View File

@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
internal Task WriteAsync(ReadOnlyMemory<byte> memory, CancellationToken cancellationToken = default(CancellationToken)) internal Task WriteAsync(ReadOnlyMemory<byte> memory, CancellationToken cancellationToken = default(CancellationToken))
{ {
// Want to keep exceptions consistent, // Want to keep exceptions consistent,
if (!_hasResponseStarted) if (!_hasResponseStarted)
{ {
return WriteAsyncAwaited(memory, cancellationToken); return WriteAsyncAwaited(memory, cancellationToken);
@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
await writeTask; await writeTask;
} }
// ConsumeAsync is called when either the first read or first write is done. // ConsumeAsync is called when either the first read or first write is done.
// There are two modes for reading and writing to the request/response bodies without upgrade. // There are two modes for reading and writing to the request/response bodies without upgrade.
// 1. Await all reads and try to read from the Output pipe // 1. Await all reads and try to read from the Output pipe
// 2. Done reading and await all writes. // 2. Done reading and await all writes.
@ -265,7 +265,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
{ {
ref var handle = ref handles[currentChunk]; ref var handle = ref handles[currentChunk];
ref var chunk = ref pDataChunks[currentChunk]; ref var chunk = ref pDataChunks[currentChunk];
handle = b.Retain(true); handle = b.Pin();
chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory;
chunk.fromMemory.BufferLength = (uint)b.Length; chunk.fromMemory.BufferLength = (uint)b.Length;
@ -281,13 +281,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
{ {
handle.Dispose(); handle.Dispose();
} }
return hr; return hr;
} }
private unsafe IISAwaitable FlushToIISAsync() private unsafe IISAwaitable FlushToIISAsync()
{ {
// Calls flush // Calls flush
var hr = 0; var hr = 0;
hr = NativeMethods.HttpFlushResponseBytes(_pInProcessHandler, out var fCompletionExpected); hr = NativeMethods.HttpFlushResponseBytes(_pInProcessHandler, out var fCompletionExpected);
if (!fCompletionExpected) if (!fCompletionExpected)
@ -356,9 +356,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
return; return;
} }
// Now we handle the read. // Now we handle the read.
var memory = Input.Writer.GetMemory(); var memory = Input.Writer.GetMemory();
_inputHandle = memory.Retain(true); _inputHandle = memory.Pin();
try try
{ {
@ -368,7 +368,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
// read value of 0 == done reading // read value of 0 == done reading
// read value of -1 == read cancelled, still allowed to read but we // read value of -1 == read cancelled, still allowed to read but we
// need a write to occur first. // need a write to occur first.
if (read == 0) if (read == 0)
{ {
break; break;
@ -388,7 +388,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
// Flush the read data for the Input Pipe writer // Flush the read data for the Input Pipe writer
var flushResult = await Input.Writer.FlushAsync(); var flushResult = await Input.Writer.FlushAsync();
// If the pipe was closed, we are done reading, // If the pipe was closed, we are done reading,
if (flushResult.IsCompleted || flushResult.IsCanceled) if (flushResult.IsCompleted || flushResult.IsCanceled)
{ {
break; break;
@ -437,7 +437,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
} }
else else
{ {
// Flush of zero bytes will // Flush of zero bytes will
await FlushToIISAsync(); await FlushToIISAsync();
} }
} }

4
src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Websockets.cs
View File

@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
ref var handle = ref handles[currentChunk]; ref var handle = ref handles[currentChunk];
ref var chunk = ref pDataChunks[currentChunk]; ref var chunk = ref pDataChunks[currentChunk];
handle = b.Retain(true); handle = b.Pin();
chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory;
chunk.fromMemory.BufferLength = (uint)b.Length; chunk.fromMemory.BufferLength = (uint)b.Length;
@ -152,7 +152,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
while (true) while (true)
{ {
var memory = Input.Writer.GetMemory(); var memory = Input.Writer.GetMemory();
_inputHandle = memory.Retain(true); _inputHandle = memory.Pin();
try try
{ {