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

Fix build

This commit is contained in:
Hao Kung 2015-06-25 17:20:42 -07:00
parent 7b31e034ca
commit e825da0910
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
View File

@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Server.WebListener
_features = new FeatureCollection(); _features = new FeatureCollection();
_authHandler = new AuthenticationHandler(requestContext); _authHandler = new AuthenticationHandler(requestContext);
_enableResponseCaching = enableResponseCaching; _enableResponseCaching = enableResponseCaching;
requestContext.Response.OnResponseStarting(OnStartDelegate, this); requestContext.Response.OnStarting(OnStartDelegate, this);
PopulateFeatures(); PopulateFeatures();
} }
@ -378,14 +378,14 @@ namespace Microsoft.AspNet.Server.WebListener
get { return Response.HasStarted; } get { return Response.HasStarted; }
} }
void IHttpResponseFeature.OnResponseStarting(Func<object, Task> callback, object state) void IHttpResponseFeature.OnStarting(Func<object, Task> callback, object state)
{ {
Response.OnResponseStarting(callback, state); Response.OnStarting(callback, state);
} }
void IHttpResponseFeature.OnResponseCompleted(Func<object, Task> callback, object state) void IHttpResponseFeature.OnCompleted(Func<object, Task> callback, object state)
{ {
Response.OnResponseCompleted(callback, state); Response.OnCompleted(callback, state);
} }
string IHttpResponseFeature.ReasonPhrase string IHttpResponseFeature.ReasonPhrase

22
src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs
View File

@ -48,8 +48,8 @@ namespace Microsoft.Net.Http.Server
private long _expectedBodyLength; private long _expectedBodyLength;
private BoundaryType _boundaryType; private BoundaryType _boundaryType;
private HttpApi.HTTP_RESPONSE_V2 _nativeResponse; private HttpApi.HTTP_RESPONSE_V2 _nativeResponse;
private IList<Tuple<Func<object, Task>, object>> _onResponseStartingActions; private IList<Tuple<Func<object, Task>, object>> _onStartingActions;
private IList<Tuple<Func<object, Task>, object>> _onResponseCompletedActions; private IList<Tuple<Func<object, Task>, object>> _onCompletedActions;
private RequestContext _requestContext; private RequestContext _requestContext;
private bool _bufferingEnabled; private bool _bufferingEnabled;
@ -80,8 +80,8 @@ namespace Microsoft.Net.Http.Server
_nativeResponse.Response_V1.Version.MajorVersion = 1; _nativeResponse.Response_V1.Version.MajorVersion = 1;
_nativeResponse.Response_V1.Version.MinorVersion = 1; _nativeResponse.Response_V1.Version.MinorVersion = 1;
_responseState = ResponseState.Created; _responseState = ResponseState.Created;
_onResponseStartingActions = new List<Tuple<Func<object, Task>, object>>(); _onStartingActions = new List<Tuple<Func<object, Task>, object>>();
_onResponseCompletedActions = new List<Tuple<Func<object, Task>, object>>(); _onCompletedActions = new List<Tuple<Func<object, Task>, object>>();
_bufferingEnabled = _requestContext.Server.BufferResponses; _bufferingEnabled = _requestContext.Server.BufferResponses;
_expectedBodyLength = 0; _expectedBodyLength = 0;
_nativeStream = null; _nativeStream = null;
@ -773,9 +773,9 @@ namespace Microsoft.Net.Http.Server
_nativeStream.SwitchToOpaqueMode(); _nativeStream.SwitchToOpaqueMode();
} }
public void OnResponseStarting(Func<object, Task> callback, object state) public void OnStarting(Func<object, Task> callback, object state)
{ {
var actions = _onResponseStartingActions; var actions = _onStartingActions;
if (actions == null) if (actions == null)
{ {
throw new InvalidOperationException("Response already started"); throw new InvalidOperationException("Response already started");
@ -784,9 +784,9 @@ namespace Microsoft.Net.Http.Server
actions.Add(new Tuple<Func<object, Task>, object>(callback, state)); actions.Add(new Tuple<Func<object, Task>, object>(callback, state));
} }
public void OnResponseCompleted(Func<object, Task> callback, object state) public void OnCompleted(Func<object, Task> callback, object state)
{ {
var actions = _onResponseCompletedActions; var actions = _onCompletedActions;
if (actions == null) if (actions == null)
{ {
throw new InvalidOperationException("Response already completed"); throw new InvalidOperationException("Response already completed");
@ -797,7 +797,7 @@ namespace Microsoft.Net.Http.Server
private void NotifyOnSendingHeaders() private void NotifyOnSendingHeaders()
{ {
var actions = Interlocked.Exchange(ref _onResponseStartingActions, null); var actions = Interlocked.Exchange(ref _onStartingActions, null);
if (actions == null) if (actions == null)
{ {
// Something threw the first time, do not try again. // Something threw the first time, do not try again.
@ -813,7 +813,7 @@ namespace Microsoft.Net.Http.Server
private void NotifyOnResponseCompleted() private void NotifyOnResponseCompleted()
{ {
var actions = Interlocked.Exchange(ref _onResponseCompletedActions, null); var actions = Interlocked.Exchange(ref _onCompletedActions, null);
if (actions == null) if (actions == null)
{ {
// Something threw the first time, do not try again. // Something threw the first time, do not try again.
@ -829,7 +829,7 @@ namespace Microsoft.Net.Http.Server
catch (Exception ex) catch (Exception ex)
{ {
RequestContext.Logger.LogWarning( RequestContext.Logger.LogWarning(
String.Format(Resources.Warning_ExceptionInOnResponseCompletedAction, nameof(OnResponseCompleted)), String.Format(Resources.Warning_ExceptionInOnResponseCompletedAction, nameof(OnCompleted)),
ex); ex);
} }
} }