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

Revert "Handle IIS OnCompleted callbacks later #17268 (#17756)" (#21525) 

This reverts commit 11ecc62ea9.
This commit is contained in:
Chris Ross 2020-05-05 19:06:54 -07:00 committed by GitHub
parent 8cd404df6b
commit 32b2894610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 60 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Servers/IIS/IIS/src/Core/IISHttpContext.cs
View File

@ -411,7 +411,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
}
}
public abstract Task ProcessRequestAsync();
public abstract Task<bool> ProcessRequestAsync();
public void OnStarting(Func<object, Task> callback, object state)
{
@ -601,9 +601,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
private async Task HandleRequest()
{
bool successfulRequest = false;
try
{
await ProcessRequestAsync();
successfulRequest = await ProcessRequestAsync();
}
catch (Exception ex)
{
@ -611,9 +612,19 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
}
finally
{
// Post completion after completing the request to resume the state machine
PostCompletion(ConvertRequestCompletionResults(successfulRequest));
// Dispose the context
Dispose();
}
}
private static NativeMethods.REQUEST_NOTIFICATION_STATUS ConvertRequestCompletionResults(bool success)
{
return success ? NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_CONTINUE
: NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_FINISH_REQUEST;
}
}
}

106
src/Servers/IIS/IIS/src/Core/IISHttpContextOfT.cs
View File

@ -23,33 +23,32 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
_application = application;
}
public override async Task ProcessRequestAsync()
public override async Task<bool> ProcessRequestAsync()
{
InitializeContext();
var context = default(TContext);
var success = true;
try
{
InitializeContext();
try
{
context = _application.CreateContext(this);
await _application.ProcessRequestAsync(context);
}
catch (BadHttpRequestException ex)
{
SetBadRequestState(ex);
ReportApplicationError(ex);
success = false;
}
catch (Exception ex)
{
ReportApplicationError(ex);
success = false;
}
context = _application.CreateContext(this);
await _application.ProcessRequestAsync(context);
}
catch (BadHttpRequestException ex)
{
SetBadRequestState(ex);
ReportApplicationError(ex);
success = false;
}
catch (Exception ex)
{
ReportApplicationError(ex);
success = false;
}
finally
{
await CompleteResponseBodyAsync();
_streams.Stop();
@ -59,18 +58,36 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
// Dispose
}
if (!_requestAborted)
if (_onCompleted != null)
{
await ProduceEnd();
}
else if (!HasResponseStarted && _requestRejectedException == null)
{
// If the request was aborted and no response was sent, there's no
// meaningful status code to log.
StatusCode = 0;
success = false;
await FireOnCompleted();
}
}
if (!_requestAborted)
{
await ProduceEnd();
}
else if (!HasResponseStarted && _requestRejectedException == null)
{
// If the request was aborted and no response was sent, there's no
// meaningful status code to log.
StatusCode = 0;
success = false;
}
try
{
_application.DisposeContext(context, _applicationException);
}
catch (Exception ex)
{
// TODO Log this
_applicationException = _applicationException ?? ex;
success = false;
}
finally
{
// Complete response writer and request reader pipe sides
_bodyOutput.Dispose();
_bodyInputPipe?.Reader.Complete();
@ -89,36 +106,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
await _readBodyTask;
}
}
catch (Exception ex)
{
success = false;
ReportApplicationError(ex);
}
finally
{
// We're done with anything that touches the request or response, unblock the client.
PostCompletion(ConvertRequestCompletionResults(success));
if (_onCompleted != null)
{
await FireOnCompleted();
}
try
{
_application.DisposeContext(context, _applicationException);
}
catch (Exception ex)
{
ReportApplicationError(ex);
}
}
}
private static NativeMethods.REQUEST_NOTIFICATION_STATUS ConvertRequestCompletionResults(bool success)
{
return success ? NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_CONTINUE
: NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_FINISH_REQUEST;
return success;
}
}
}

7
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseBodyTests.cs
View File

@ -30,12 +30,5 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
{
Assert.Equal(20, (await _fixture.Client.GetByteArrayAsync($"/FlushedPipeAndThenUnflushedPipe")).Length);
}
[ConditionalFact]
[RequiresNewHandler]
public async Task ResponseBodyTest_BodyCompletionNotBlockedByOnCompleted()
{
Assert.Equal("SlowOnCompleted", await _fixture.Client.GetStringAsync($"/SlowOnCompleted"));
}
}
}

7
src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
View File

@ -1016,12 +1016,5 @@ namespace TestSite
await context.Response.WriteAsync(httpsPort.HasValue ? httpsPort.Value.ToString() : "NOVALUE");
}
public async Task SlowOnCompleted(HttpContext context)
{
// This shouldn't block the response or the server from shutting down.
context.Response.OnCompleted(() => Task.Delay(TimeSpan.FromMinutes(5)));
await context.Response.WriteAsync("SlowOnCompleted");
}
}
}